aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/hypixel.ts4
-rw-r--r--src/hypixelApi.ts4
-rw-r--r--test-data-generator/index.ts17
-rw-r--r--test/data/constants/collections.json2
-rw-r--r--test/data/constants/harp_songs.json15
-rw-r--r--test/data/constants/minions.json1
-rw-r--r--test/data/constants/pets.json1
-rw-r--r--test/data/constants/skills.json1
-rw-r--r--test/data/constants/stats.json177
-rw-r--r--test/data/constants/values.json4
-rw-r--r--test/data/constants/zones.json17
-rw-r--r--test/data/player/6536bfed869548fd83a1ecd24cf2a0fd.json1556
-rw-r--r--test/data/player/e403573808ad45ddb5c48ec7c4db0144.json84
-rw-r--r--test/data/player/ef3bb867eec048a1a9b92b451f0ffc66.json2530
-rw-r--r--test/data/resources/skyblock/items.json41420
-rw-r--r--test/data/skyblock/profiles/6536bfed869548fd83a1ecd24cf2a0fd.json636
-rw-r--r--test/data/skyblock/profiles/e403573808ad45ddb5c48ec7c4db0144.json18
-rw-r--r--test/data/skyblock/profiles/ef3bb867eec048a1a9b92b451f0ffc66.json2034
-rw-r--r--test/test.js7
19 files changed, 45957 insertions, 2571 deletions
diff --git a/src/hypixel.ts b/src/hypixel.ts
index 80c73b1..c72e397 100644
--- a/src/hypixel.ts
+++ b/src/hypixel.ts
@@ -64,13 +64,13 @@ const cleanResponseFunctions = {
async function cleanResponse<P extends keyof typeof cleanResponseFunctions>(
path: P,
- data: typedHypixelApi.Requests[P]['response'],
+ data: typedHypixelApi.Requests[P]['response']['data'],
options: ApiOptions
): Promise<Awaited<ReturnType<typeof cleanResponseFunctions[P]>>> {
// Cleans up an api response
const cleaningFunction: typeof cleanResponseFunctions[P] = cleanResponseFunctions[path]
// we do `as any` because typescript unfortunately doesn't know which path it is
- const cleanedData = await cleaningFunction(data.data as any, options)
+ const cleanedData = await cleaningFunction(data as any, options)
return cleanedData as Awaited<ReturnType<typeof cleanResponseFunctions[P]>>
}
diff --git a/src/hypixelApi.ts b/src/hypixelApi.ts
index adc6378..5f2bfb1 100644
--- a/src/hypixelApi.ts
+++ b/src/hypixelApi.ts
@@ -98,7 +98,7 @@ export interface HypixelPlayerSocialMedia {
/** Send an HTTP request to the Hypixel API */
-export let sendApiRequest = async<P extends keyof typedHypixelApi.Requests>(path: P, options: typedHypixelApi.Requests[P]['options']): Promise<typedHypixelApi.Requests[P]['response']> => {
+export let sendApiRequest = async<P extends keyof typedHypixelApi.Requests>(path: P, options: typedHypixelApi.Requests[P]['options']): Promise<typedHypixelApi.Requests[P]['response']['data']> => {
// Send a raw http request to api.hypixel.net, and return the parsed json
let response: typedHypixelApi.Requests[P]['response']
try {
@@ -152,7 +152,7 @@ export let sendApiRequest = async<P extends keyof typedHypixelApi.Requests>(path
await sleep(10000)
return await sendApiRequest(path, options)
}
- return response
+ return response.data
}
// this is necessary for mocking in the tests because es6
diff --git a/test-data-generator/index.ts b/test-data-generator/index.ts
index bf8f34b..c8009c1 100644
--- a/test-data-generator/index.ts
+++ b/test-data-generator/index.ts
@@ -20,8 +20,17 @@ const playerUuids = [
]
async function writeTestData(requestPath: string, name: string, contents: any) {
- const dir = path.join(process.cwd(), '..', 'test', 'data', requestPath)
- await fs.mkdir(path.dirname(path.join(dir, `${name}.json`)), { recursive: true })
+ if (!name) {
+ const splitRequestPath = requestPath.split('/')
+ name = splitRequestPath[splitRequestPath.length - 1]
+ requestPath = splitRequestPath.slice(0, -1).join('/')
+ }
+ const dir = path.join(process.cwd(), 'test', 'data', requestPath)
+ try {
+ await fs.mkdir(path.dirname(path.join(dir, `${name}.json`)), { recursive: true })
+ } catch (err) {
+ console.error(err)
+ }
await fs.writeFile(path.join(dir, `${name}.json`), JSON.stringify(contents, null, 2))
}
@@ -45,6 +54,7 @@ async function addConstants() {
'stats',
'values',
'zones',
+ 'harp_songs'
]
for (const constantName of constantNames) {
const constantData = await constants.fetchJSONConstant(constantName + '.json')
@@ -55,6 +65,7 @@ async function addConstants() {
}
async function main() {
+ await addResponse('resources/skyblock/items', {}, '')
const uuidsToUsername = {}
for (const playerUuid of playerUuids) {
await addResponse('player', { uuid: playerUuid }, playerUuid)
@@ -66,6 +77,8 @@ async function main() {
await writeTestData('', 'mojang', uuidsToUsername)
await addConstants()
+
+ console.log('Done!')
}
main() \ No newline at end of file
diff --git a/test/data/constants/collections.json b/test/data/constants/collections.json
index efab904..fbd602b 100644
--- a/test/data/constants/collections.json
+++ b/test/data/constants/collections.json
@@ -17,11 +17,13 @@
"end_stone",
"ender_pearl",
"feather",
+ "gemstone",
"ghast_tear",
"glowstone_dust",
"gold_ingot",
"gravel",
"gunpowder",
+ "hard_stone",
"ice",
"ink_sac",
"iron_ingot",
diff --git a/test/data/constants/harp_songs.json b/test/data/constants/harp_songs.json
new file mode 100644
index 0000000..6145808
--- /dev/null
+++ b/test/data/constants/harp_songs.json
@@ -0,0 +1,15 @@
+[
+ "amazing_grace",
+ "brahms",
+ "frere_jacques",
+ "greensleeves",
+ "happy_birthday",
+ "hymn_joy",
+ "jeopardy",
+ "joy_world",
+ "minuet",
+ "pachelbel",
+ "pure_imagination",
+ "through_the_campfire",
+ "vie_en_rose"
+] \ No newline at end of file
diff --git a/test/data/constants/minions.json b/test/data/constants/minions.json
index a44cd62..ea11016 100644
--- a/test/data/constants/minions.json
+++ b/test/data/constants/minions.json
@@ -23,6 +23,7 @@
"glowstone",
"gold",
"gravel",
+ "hard_stone",
"ice",
"iron",
"jungle",
diff --git a/test/data/constants/pets.json b/test/data/constants/pets.json
index 3b7cbd7..d52d1a6 100644
--- a/test/data/constants/pets.json
+++ b/test/data/constants/pets.json
@@ -39,6 +39,7 @@
"RABBIT",
"RAT",
"ROCK",
+ "SCATHA",
"SHEEP",
"SILVERFISH",
"SKELETON",
diff --git a/test/data/constants/skills.json b/test/data/constants/skills.json
index ab04362..d337458 100644
--- a/test/data/constants/skills.json
+++ b/test/data/constants/skills.json
@@ -8,5 +8,6 @@
"foraging",
"mining",
"runecrafting",
+ "social",
"taming"
] \ No newline at end of file
diff --git a/test/data/constants/stats.json b/test/data/constants/stats.json
index 0632eef..8dd66c5 100644
--- a/test/data/constants/stats.json
+++ b/test/data/constants/stats.json
@@ -24,6 +24,7 @@
"auctions_won",
"chicken_race_best_time",
"chicken_race_best_time_2",
+ "crops_mined",
"deaths",
"deaths_alpha_wolf",
"deaths_ancient_one",
@@ -31,21 +32,28 @@
"deaths_arachne_brood",
"deaths_arachne_keeper",
"deaths_armor_stand",
+ "deaths_automaton",
+ "deaths_bal_boss",
+ "deaths_bat",
+ "deaths_belle",
"deaths_blaze",
"deaths_blue_shark",
"deaths_bonzo",
"deaths_bonzo_summon_undead",
"deaths_brood_mother_cave_spider",
"deaths_brood_mother_spider",
+ "deaths_butterfly",
"deaths_cactus",
"deaths_carrot_king",
"deaths_catfish",
"deaths_cave_spider",
"deaths_caverns_ghost",
+ "deaths_cavitak",
"deaths_cellar_spider",
"deaths_chicken",
"deaths_chicken_deep",
"deaths_corrupted_protector",
+ "deaths_cow",
"deaths_creeper",
"deaths_crushed",
"deaths_crypt_dreadlord",
@@ -53,6 +61,8 @@
"deaths_crypt_souleater",
"deaths_crypt_tank_zombie",
"deaths_crypt_undead",
+ "deaths_crypt_undead__fudgiethewhale",
+ "deaths_crypt_undead__onah",
"deaths_crypt_undead_adamwho",
"deaths_crypt_undead_agentk",
"deaths_crypt_undead_alexander",
@@ -62,15 +72,19 @@
"deaths_crypt_undead_blockskey",
"deaths_crypt_undead_bloozing",
"deaths_crypt_undead_cecer",
+ "deaths_crypt_undead_cheesey",
"deaths_crypt_undead_chilynn",
"deaths_crypt_undead_christian",
"deaths_crypt_undead_codename_b",
"deaths_crypt_undead_connorlinfoot",
"deaths_crypt_undead_dctr",
+ "deaths_crypt_undead_deadorkai",
+ "deaths_crypt_undead_districtgecko",
"deaths_crypt_undead_donpireso",
"deaths_crypt_undead_dueces",
"deaths_crypt_undead_erosemberg",
"deaths_crypt_undead_externalizable",
+ "deaths_crypt_undead_falloutowns",
"deaths_crypt_undead_flameboy101",
"deaths_crypt_undead_friedrich",
"deaths_crypt_undead_hypixel",
@@ -83,12 +97,14 @@
"deaths_crypt_undead_magicboys",
"deaths_crypt_undead_marius",
"deaths_crypt_undead_minikloon",
+ "deaths_crypt_undead_mistresseldrid",
"deaths_crypt_undead_nicholas",
"deaths_crypt_undead_nitroholic_",
"deaths_crypt_undead_orangemarshall",
"deaths_crypt_undead_pieter",
"deaths_crypt_undead_pjoke1",
"deaths_crypt_undead_plancke",
+ "deaths_crypt_undead_plummel",
"deaths_crypt_undead_relenter",
"deaths_crypt_undead_revengeee",
"deaths_crypt_undead_rezzus",
@@ -96,9 +112,12 @@
"deaths_crypt_undead_sfarnham",
"deaths_crypt_undead_skyerzz",
"deaths_crypt_undead_sylent",
+ "deaths_crypt_undead_themgrf",
"deaths_crypt_undead_thorlon",
"deaths_crypt_undead_valentin",
+ "deaths_crypt_undead_vinny8ball666",
"deaths_crypt_undead_williamtiger",
+ "deaths_crypt_undead_winghide",
"deaths_crypt_witherskeleton",
"deaths_crystal_sentry",
"deaths_dante_goon",
@@ -122,6 +141,7 @@
"deaths_fall_kill",
"deaths_fire",
"deaths_fireball_magma_cube",
+ "deaths_flaming_worm",
"deaths_frosty_the_snowman",
"deaths_frozen_steve",
"deaths_gaia_construct",
@@ -131,11 +151,13 @@
"deaths_ghast",
"deaths_goblin_battler",
"deaths_goblin_creeper",
+ "deaths_goblin_flamethrower",
"deaths_goblin_golem",
"deaths_goblin_knife_thrower",
"deaths_goblin_murderlover",
"deaths_goblin_weakling_bow",
"deaths_goblin_weakling_melee",
+ "deaths_goldor",
"deaths_great_white_shark",
"deaths_grim_reaper",
"deaths_grinch",
@@ -151,12 +173,40 @@
"deaths_ice_walker",
"deaths_invisible_creeper",
"deaths_iron_golem",
+ "deaths_island_creeper",
+ "deaths_island_dasher_spider",
+ "deaths_island_enderman",
+ "deaths_island_iron_golem",
+ "deaths_island_lapis_zombie",
+ "deaths_island_old_wolf",
+ "deaths_island_phantom_spirit",
+ "deaths_island_redstone_pigman",
+ "deaths_island_ruin_wolf",
+ "deaths_island_scary_jerry",
+ "deaths_island_skeleton",
+ "deaths_island_spider",
+ "deaths_island_splitter_spider",
+ "deaths_island_splitter_spider_silverfish",
+ "deaths_island_trick_or_treater",
+ "deaths_island_unburried_zombie",
+ "deaths_island_voracious_spider",
+ "deaths_island_witch",
+ "deaths_island_wither_gourd",
+ "deaths_island_wraith",
+ "deaths_island_zombie",
+ "deaths_island_zombie_villager",
"deaths_jockey_shot_silverfish",
"deaths_jockey_skeleton",
+ "deaths_kalhuiki_elder",
+ "deaths_kalhuiki_tribe_man",
+ "deaths_kalhuiki_tribe_woman",
+ "deaths_key_guardian",
"deaths_kill",
"deaths_kill_fire",
"deaths_king_midas",
"deaths_lapis_zombie",
+ "deaths_lava_blaze",
+ "deaths_lava_pigman",
"deaths_liquid_hot_magma",
"deaths_livid",
"deaths_livid_clone",
@@ -178,16 +228,22 @@
"deaths_master_crypt_undead_agentk",
"deaths_master_crypt_undead_alexander",
"deaths_master_crypt_undead_apunch",
+ "deaths_master_crypt_undead_bembo",
"deaths_master_crypt_undead_bernhard",
+ "deaths_master_crypt_undead_blockskey",
"deaths_master_crypt_undead_bloozing",
+ "deaths_master_crypt_undead_cecer",
"deaths_master_crypt_undead_chilynn",
+ "deaths_master_crypt_undead_christian",
"deaths_master_crypt_undead_codename_b",
"deaths_master_crypt_undead_connorlinfoot",
"deaths_master_crypt_undead_dctr",
+ "deaths_master_crypt_undead_deadorkai",
"deaths_master_crypt_undead_districtgecko",
"deaths_master_crypt_undead_donpireso",
"deaths_master_crypt_undead_dueces",
"deaths_master_crypt_undead_externalizable",
+ "deaths_master_crypt_undead_falloutowns",
"deaths_master_crypt_undead_flameboy101",
"deaths_master_crypt_undead_friedrich",
"deaths_master_crypt_undead_hypixel",
@@ -197,11 +253,13 @@
"deaths_master_crypt_undead_ladybleu",
"deaths_master_crypt_undead_likaos",
"deaths_master_crypt_undead_magicboys",
+ "deaths_master_crypt_undead_marius",
"deaths_master_crypt_undead_minikloon",
"deaths_master_crypt_undead_mistresseldrid",
"deaths_master_crypt_undead_nicholas",
"deaths_master_crypt_undead_nitroholic_",
"deaths_master_crypt_undead_orangemarshall",
+ "deaths_master_crypt_undead_pieter",
"deaths_master_crypt_undead_plancke",
"deaths_master_crypt_undead_plummel",
"deaths_master_crypt_undead_relenter",
@@ -220,12 +278,16 @@
"deaths_master_diamond_guy",
"deaths_master_dungeon_respawning_skeleton",
"deaths_master_dungeon_respawning_skeleton_skull",
+ "deaths_master_goldor",
"deaths_master_king_midas",
"deaths_master_livid",
"deaths_master_livid_clone",
"deaths_master_lonely_spider",
"deaths_master_lost_adventurer",
+ "deaths_master_maxor",
"deaths_master_mimic",
+ "deaths_master_necron",
+ "deaths_master_necron_guard",
"deaths_master_parasite",
"deaths_master_professor",
"deaths_master_professor_archer_guardian",
@@ -244,6 +306,7 @@
"deaths_master_scarf_warrior",
"deaths_master_shadow_assassin",
"deaths_master_skeleton_grunt",
+ "deaths_master_skeleton_lord",
"deaths_master_skeleton_master",
"deaths_master_skeleton_soldier",
"deaths_master_skeletor",
@@ -256,17 +319,29 @@
"deaths_master_spirit_rabbit",
"deaths_master_spirit_sheep",
"deaths_master_spirit_wolf",
+ "deaths_master_storm",
"deaths_master_super_archer",
"deaths_master_super_tank_zombie",
"deaths_master_tentaclees",
+ "deaths_master_the_watcher",
"deaths_master_watcher_bonzo",
+ "deaths_master_watcher_giant_bigfoot",
+ "deaths_master_watcher_giant_boulder",
+ "deaths_master_watcher_giant_diamond",
+ "deaths_master_watcher_giant_laser",
"deaths_master_watcher_guardian",
"deaths_master_watcher_livid",
"deaths_master_watcher_scarf",
"deaths_master_watcher_summon_undead",
+ "deaths_master_wither_guard",
+ "deaths_master_wither_husk",
+ "deaths_master_wither_king",
+ "deaths_master_wither_king_dragon",
+ "deaths_master_wither_miner",
"deaths_master_zombie_commander",
"deaths_master_zombie_grunt",
"deaths_master_zombie_knight",
+ "deaths_master_zombie_lord",
"deaths_master_zombie_soldier",
"deaths_maxor",
"deaths_mimic",
@@ -274,6 +349,7 @@
"deaths_minos_hunter",
"deaths_minos_inquisitor",
"deaths_minotaur",
+ "deaths_necron",
"deaths_necron_guard",
"deaths_night_respawning_skeleton",
"deaths_nightmare",
@@ -290,6 +366,7 @@
"deaths_pig_zombie",
"deaths_pigman",
"deaths_player",
+ "deaths_poisoned_water_worm",
"deaths_professor",
"deaths_professor_archer_guardian",
"deaths_professor_guardian_summon",
@@ -326,6 +403,7 @@
"deaths_shrine_skeleton_horseman",
"deaths_siamese_lynx",
"deaths_silverfish",
+ "deaths_silvo",
"deaths_skeleton",
"deaths_skeleton_emperor",
"deaths_skeleton_grunt",
@@ -335,6 +413,9 @@
"deaths_skeletor",
"deaths_skeletor_prime",
"deaths_slime",
+ "deaths_slimey_slime",
+ "deaths_sludge",
+ "deaths_smog",
"deaths_sniper_skeleton",
"deaths_snowman",
"deaths_soul_of_the_alpha",
@@ -350,14 +431,21 @@
"deaths_spirit_wolf",
"deaths_splitter_spider",
"deaths_splitter_spider_silverfish",
+ "deaths_storm",
"deaths_strong_dragon",
"deaths_suffocation",
"deaths_super_archer",
"deaths_super_tank_zombie",
"deaths_superior_dragon",
"deaths_tarantula_spider",
+ "deaths_team_treasurite_corleone",
+ "deaths_team_treasurite_grunt",
+ "deaths_team_treasurite_sebastian",
+ "deaths_team_treasurite_viper",
+ "deaths_team_treasurite_wendy",
"deaths_tentaclees",
"deaths_the_watcher",
+ "deaths_thyst",
"deaths_tiger_shark",
"deaths_trap",
"deaths_treasure_hoarder",
@@ -366,7 +454,9 @@
"deaths_unknown",
"deaths_unstable_dragon",
"deaths_vicious_wolf",
+ "deaths_vittomite",
"deaths_void",
+ "deaths_voidling_enderman",
"deaths_voidling_extremist",
"deaths_voidling_fanatic",
"deaths_voracious_spider",
@@ -381,6 +471,7 @@
"deaths_watcher_scarf",
"deaths_watcher_summon_undead",
"deaths_water_hydra",
+ "deaths_water_worm",
"deaths_weaver_spider",
"deaths_werewolf",
"deaths_wise_dragon",
@@ -394,6 +485,7 @@
"deaths_wolf",
"deaths_wraith",
"deaths_yeti",
+ "deaths_yog",
"deaths_young_dragon",
"deaths_zealot_enderman",
"deaths_zombie",
@@ -402,6 +494,7 @@
"deaths_zombie_grunt",
"deaths_zombie_knight",
"deaths_zombie_lord",
+ "deaths_zombie_miner",
"deaths_zombie_soldier",
"deaths_zombie_villager",
"deaths_lost_adventure",
@@ -436,6 +529,7 @@
"gifts_received",
"highest_crit_damage",
"highest_critical_damage",
+ "highest_damage",
"items_fished",
"items_fished_large_treasure",
"items_fished_normal",
@@ -445,19 +539,23 @@
"kills_arachne",
"kills_arachne_brood",
"kills_arachne_keeper",
+ "kills_automaton",
"kills_bat_pinata",
"kills_bat_spooky",
"kills_batty_witch",
+ "kills_belle",
"kills_blaze",
"kills_blaze_higher_or_lower",
"kills_blue_shark",
"kills_bonzo_summon_undead",
"kills_brood_mother_cave_spider",
"kills_brood_mother_spider",
+ "kills_butterfly",
"kills_carrot_king",
"kills_catfish",
"kills_cave_spider",
"kills_caverns_ghost",
+ "kills_cavitak",
"kills_cellar_spider",
"kills_chicken",
"kills_chicken_deep",
@@ -529,9 +627,13 @@
"kills_dungeon_respawning_skeleton_skull",
"kills_dungeon_secret_bat",
"kills_emerald_slime",
+ "kills_empowered_magma_cube",
+ "kills_empowered_wither_skeleton",
"kills_enderman",
"kills_endermite",
+ "kills_fire_bat",
"kills_fireball_magma_cube",
+ "kills_flaming_worm",
"kills_forest_island_bat",
"kills_frosty_the_snowman",
"kills_frozen_steve",
@@ -544,6 +646,7 @@
"kills_goblin_battler",
"kills_goblin_creeper",
"kills_goblin_creepertamer",
+ "kills_goblin_flamethrower",
"kills_goblin_golem",
"kills_goblin_knife_thrower",
"kills_goblin_murderlover",
@@ -556,16 +659,55 @@
"kills_guardian_defender",
"kills_guardian_emperor",
"kills_headless_horseman",
+ "kills_horse",
"kills_horseman_bat",
"kills_horseman_horse",
"kills_horseman_zombie",
"kills_howling_spirit",
"kills_ice_walker",
"kills_invisible_creeper",
+ "kills_island_batty_witch",
+ "kills_island_black_and_white_rabbit",
+ "kills_island_black_rabbit",
+ "kills_island_brown_rabbit",
+ "kills_island_creeper",
+ "kills_island_dasher_spider",
+ "kills_island_enderman",
+ "kills_island_gold_rabbit",
+ "kills_island_iron_golem",
+ "kills_island_lapis_zombie",
+ "kills_island_old_wolf",
+ "kills_island_phantom_spirit",
+ "kills_island_redstone_pigman",
+ "kills_island_ruin_wolf",
+ "kills_island_salt_and_pepper_rabbit",
+ "kills_island_scary_jerry",
+ "kills_island_skeleton",
+ "kills_island_spider",
+ "kills_island_splitter_spider",
+ "kills_island_splitter_spider_silverfish",
+ "kills_island_trick_or_treater",
+ "kills_island_unburried_zombie",
+ "kills_island_villager",
+ "kills_island_voracious_spider",
+ "kills_island_white_rabbit",
+ "kills_island_witch",
+ "kills_island_wither_gourd",
+ "kills_island_wraith",
+ "kills_island_zealot_enderman",
+ "kills_island_zombie",
+ "kills_island_zombie_villager",
"kills_jockey_shot_silverfish",
"kills_jockey_skeleton",
+ "kills_kalhuiki_elder",
+ "kills_kalhuiki_tribe_man",
+ "kills_kalhuiki_tribe_woman",
+ "kills_kalhuiki_youngling",
+ "kills_key_guardian",
"kills_king_midas",
"kills_lapis_zombie",
+ "kills_lava_blaze",
+ "kills_lava_pigman",
"kills_liquid_hot_magma",
"kills_lonely_spider",
"kills_lost_adventurer",
@@ -628,6 +770,7 @@
"kills_master_lonely_spider",
"kills_master_lost_adventurer",
"kills_master_mimic",
+ "kills_master_necron_guard",
"kills_master_parasite",
"kills_master_professor_guardian_summon",
"kills_master_sadan_giant",
@@ -640,6 +783,7 @@
"kills_master_scarf_warrior",
"kills_master_shadow_assassin",
"kills_master_skeleton_grunt",
+ "kills_master_skeleton_lord",
"kills_master_skeleton_master",
"kills_master_skeleton_soldier",
"kills_master_skeletor",
@@ -657,12 +801,21 @@
"kills_master_tentaclees",
"kills_master_thorn",
"kills_master_watcher_bonzo",
+ "kills_master_watcher_giant_bigfoot",
+ "kills_master_watcher_giant_boulder",
+ "kills_master_watcher_giant_diamond",
+ "kills_master_watcher_giant_laser",
"kills_master_watcher_livid",
"kills_master_watcher_scarf",
"kills_master_watcher_summon_undead",
+ "kills_master_wither_guard",
+ "kills_master_wither_husk",
+ "kills_master_wither_king_dragon",
+ "kills_master_wither_miner",
"kills_master_zombie_commander",
"kills_master_zombie_grunt",
"kills_master_zombie_knight",
+ "kills_master_zombie_lord",
"kills_master_zombie_soldier",
"kills_mayor_jerry_blue",
"kills_mayor_jerry_golden",
@@ -682,6 +835,7 @@
"kills_oasis_rabbit",
"kills_oasis_sheep",
"kills_obsidian_wither",
+ "kills_ocelot",
"kills_old_dragon",
"kills_old_wolf",
"kills_pack_spirit",
@@ -692,6 +846,7 @@
"kills_pig",
"kills_pigman",
"kills_player",
+ "kills_poisoned_water_worm",
"kills_pond_squid",
"kills_powder_ghast",
"kills_professor_guardian_summon",
@@ -708,6 +863,7 @@
"kills_sadan_giant",
"kills_sadan_golem",
"kills_sadan_statue",
+ "kills_saved_sludge",
"kills_scarecrow",
"kills_scared_skeleton",
"kills_scarf_archer",
@@ -715,6 +871,7 @@
"kills_scarf_priest",
"kills_scarf_warrior",
"kills_scary_jerry",
+ "kills_scatha",
"kills_sea_archer",
"kills_sea_guardian",
"kills_sea_leech",
@@ -726,6 +883,7 @@
"kills_shrine_skeleton_horseman",
"kills_siamese_lynx",
"kills_silverfish",
+ "kills_silvo",
"kills_skeleton",
"kills_skeleton_emperor",
"kills_skeleton_grunt",
@@ -735,6 +893,9 @@
"kills_skeletor",
"kills_skeletor_prime",
"kills_slime",
+ "kills_slimey_slime",
+ "kills_sludge",
+ "kills_smog",
"kills_sniper_skeleton",
"kills_soul_of_the_alpha",
"kills_spider",
@@ -753,9 +914,16 @@
"kills_super_tank_zombie",
"kills_superior_dragon",
"kills_tarantula_spider",
+ "kills_team_treasurite_corleone",
+ "kills_team_treasurite_grunt",
+ "kills_team_treasurite_sebastian",
+ "kills_team_treasurite_viper",
+ "kills_team_treasurite_wendy",
"kills_tentaclees",
"kills_thorn",
+ "kills_thyst",
"kills_tiger_shark",
+ "kills_trapped_sludge",
"kills_trapper_chicken",
"kills_trapper_cow",
"kills_trapper_pig",
@@ -766,6 +934,7 @@
"kills_unburried_zombie",
"kills_unstable_dragon",
"kills_vicious_wolf",
+ "kills_vittomite",
"kills_voidling_enderman",
"kills_voidling_extremist",
"kills_voidling_fanatic",
@@ -780,6 +949,7 @@
"kills_watcher_scarf",
"kills_watcher_summon_undead",
"kills_water_hydra",
+ "kills_water_worm",
"kills_weaver_spider",
"kills_werewolf",
"kills_wise_dragon",
@@ -789,8 +959,10 @@
"kills_wither_guard",
"kills_wither_miner",
"kills_wither_skeleton",
+ "kills_worm",
"kills_wraith",
"kills_yeti",
+ "kills_yog",
"kills_young_dragon",
"kills_zealot_enderman",
"kills_zombie",
@@ -799,6 +971,7 @@
"kills_zombie_grunt",
"kills_zombie_knight",
"kills_zombie_lord",
+ "kills_zombie_miner",
"kills_zombie_soldier",
"kills_zombie_villager",
"most_winter_cannonballs_hit",
@@ -837,6 +1010,8 @@
"pet_milestone_ores_mined",
"pet_milestone_sea_creatures_killed",
"pumpkin_launcher_count",
+ "sea_creature_kills",
"shredder_bait",
- "shredder_fished"
+ "shredder_fished",
+ "total_pet_exp_gained"
] \ No newline at end of file
diff --git a/test/data/constants/values.json b/test/data/constants/values.json
index 4b2a608..ec2e0b0 100644
--- a/test/data/constants/values.json
+++ b/test/data/constants/values.json
@@ -1,4 +1,4 @@
{
- "max_minions": 613,
- "max_fairy_souls": 227
+ "max_minions": 633,
+ "max_fairy_souls": 228
} \ No newline at end of file
diff --git a/test/data/constants/zones.json b/test/data/constants/zones.json
index 9943fc4..e182e42 100644
--- a/test/data/constants/zones.json
+++ b/test/data/constants/zones.json
@@ -1,10 +1,12 @@
[
+ "archery_range",
"aristocrat_passage",
"auction_house",
"bank",
"bazaar_alley",
"blacksmith",
"blazing_fortress",
+ "breakable_tnt_wall",
"builders_house",
"canvas",
"canvas_room",
@@ -57,7 +59,21 @@
"gold_mine",
"gorge",
"grand_library",
+ "greater_mines",
+ "greater_mines_crystal_room",
+ "greater_mines_fairy_grotto",
+ "greater_mines_goblin_holdout",
+ "greater_mines_goblin_uber_room",
+ "greater_mines_jungle",
+ "greater_mines_jungle_uber_room",
+ "greater_mines_magma_fields",
+ "greater_mines_magma_uber_room",
+ "greater_mines_mithril",
+ "greater_mines_mithril_uber_room",
+ "greater_mines_precursor",
+ "greater_mines_precursor_uber_room",
"hanging_court",
+ "harp_minigame",
"hero_barracks",
"high_level",
"ice_pond",
@@ -69,6 +85,7 @@
"mine",
"miners_guild",
"mountain",
+ "museum",
"mushroom_desert",
"oasis",
"overgrown_mushroom_cave",
diff --git a/test/data/player/6536bfed869548fd83a1ecd24cf2a0fd.json b/test/data/player/6536bfed869548fd83a1ecd24cf2a0fd.json
index 4c5ad19..0c242b9 100644
--- a/test/data/player/6536bfed869548fd83a1ecd24cf2a0fd.json
+++ b/test/data/player/6536bfed869548fd83a1ecd24cf2a0fd.json
@@ -275,7 +275,11 @@
"tntgames_spleef_repulsor",
"pit_get_endless_quiver_arrows",
"pit_small_streak",
- "skyblock_bigger_storage_is_seeded"
+ "skyblock_bigger_storage_is_seeded",
+ "skyblock_resourceful",
+ "murdermystery_uncalculated",
+ "duels_master_builders",
+ "duels_jack_of_all_trades"
],
"displayname": "py5",
"firstLogin": 1424644924085,
@@ -289,12 +293,12 @@
"py5",
"b3abus"
],
- "lastLogin": 1622501301452,
- "networkExp": 14449927,
+ "lastLogin": 1648421348120,
+ "networkExp": 15223917,
"playername": "py5",
"stats": {
"Arcade": {
- "coins": 2122258,
+ "coins": 2141266,
"deaths_throw_out": 13,
"kills_throw_out": 10,
"music": true,
@@ -381,7 +385,8 @@
"eggs_found_easter_simulator": 26,
"wins_ender": 1,
"wins_grinch_simulator_v2": 1,
- "gifts_grinch_simulator_v2": 17
+ "gifts_grinch_simulator_v2": 17,
+ "blocks_destroyed_ender": 207
},
"Battleground": {
"chosen_class": "warrior",
@@ -397,10 +402,10 @@
"legacyachievement10",
"legacyachievement9"
],
- "coins": 166325
+ "coins": 175395
},
"TNTGames": {
- "coins": 70584,
+ "coins": 81881,
"deaths_bowspleef": 15,
"tags_bowspleef": 271,
"new_spleef_repulsor": 1,
@@ -436,10 +441,10 @@
],
"run_potions_splashed_on_players": 14,
"record_tntrun": 184,
- "deaths_tntrun": 204,
+ "deaths_tntrun": 208,
"winstreak": 0,
"votes_Relic": 4,
- "wizards_selected_class": "new_witherwizard",
+ "wizards_selected_class": "new_bloodwizard",
"new_witherwizard_deaths": 11,
"deaths_capture": 11,
"votes_Asteroids": 1,
@@ -472,7 +477,8 @@
"air_time_capture": 2807,
"assists_capture": 4,
"new_tntrun_speed_potions": 1,
- "new_tntrun_slowness_potions": 1
+ "new_tntrun_slowness_potions": 1,
+ "lastTourneyAd": 1628999224615
},
"GingerBread": {
"engine_active": "{GingerbreadPart:{PartType:ENGINE,PartRarity:BASIC}}",
@@ -488,7 +494,7 @@
"shoes_active": "GOLD_SHOES",
"jacket_active": "GOLD_JACKET",
"pants_active": "GOLD_PANTS",
- "coins": 70395,
+ "coins": 80615,
"lastTourneyAd": 1596934457455
},
"SkyWars": {
@@ -570,7 +576,7 @@
"losses_kit_basic_solo_default": 59,
"deaths_team_insane": 23,
"survived_players_kit_mining_team_default": 91,
- "coins": 603673,
+ "coins": 612333,
"survived_players_team": 235,
"losses_team_insane": 22,
"losses_kit_mining_team_default": 8,
@@ -665,7 +671,7 @@
"arrows_hit_kit_mining_team_default": 1,