From 33fe9fe11020ef39114618494c3b390d672839a8 Mon Sep 17 00:00:00 2001 From: Picsou993 <33390780+Picsou993@users.noreply.github.com> Date: Thu, 9 Dec 2021 03:30:55 +0100 Subject: [PATCH 1/2] Adding new pets + reordering pets. Adding all new pets with their name and rarity and reordering all pets to use the Collectibles Menu Format. --- .../java/net/hypixel/api/pets/PetType.java | 233 +++++++++++------- 1 file changed, 141 insertions(+), 92 deletions(-) diff --git a/hypixel-api-core/src/main/java/net/hypixel/api/pets/PetType.java b/hypixel-api-core/src/main/java/net/hypixel/api/pets/PetType.java index 5f72c4ae..676e76af 100644 --- a/hypixel-api-core/src/main/java/net/hypixel/api/pets/PetType.java +++ b/hypixel-api-core/src/main/java/net/hypixel/api/pets/PetType.java @@ -4,126 +4,175 @@ public enum PetType { + SILVERFISH("Silverfish", Rarity.COMMON), + CAT_BLACK("Cat: Black", Rarity.COMMON), CAT_RED("Cat: Red", Rarity.COMMON), CAT_SIAMESE("Cat: Siamese", Rarity.COMMON), - SILVERFISH("Silverfish", Rarity.COMMON), - ZOMBIE("Zombie", Rarity.COMMON), - PIG("Pig", Rarity.COMMON), - COW("Cow", Rarity.COMMON), + CAT_BLACK_BABY("Cat: Black (Baby)", Rarity.RARE), + CAT_RED_BABY("Cat: Red (Baby)", Rarity.RARE), + CAT_SIAMESE_BABY("Cat: Siamese (Baby)", Rarity.RARE), + WILD_OCELOT("Wild Ocelot"), + WILD_OCELOT_BABY("Wild Ocelot (Baby)"), + WOLF("Wolf", Rarity.COMMON), - CHICKEN("Chicken", Rarity.COMMON), - HORSE_BROWN("Horse: Brown", Rarity.COMMON), - SHEEP_WHITE("Sheep: White", Rarity.COMMON), - SHEEP_GRAY("Sheep: Gray", Rarity.COMMON), - SHEEP_BROWN("Sheep: Brown", Rarity.COMMON), - SHEEP_SILVER("Sheep: Silver", Rarity.COMMON), + WOLF_BABY("Wolf (Baby)", Rarity.RARE), + + BAT("Bat", Rarity.EPIC), + + BLACK_RABBIT("Rabbit: Black", Rarity.RARE), + BLACK_WHITE_RABBIT("Rabbit: Black & White", Rarity.EPIC), + BROWN_RABBIT("Rabbit: Brown", Rarity.RARE), + GOLD_RABBIT("Rabbit: Gold", Rarity.EPIC), + SALT_PEPPER_RABBIT("Rabbit: Salt & Pepper", Rarity.EPIC), + WHITE_RABBIT("Rabbit: White", Rarity.RARE), + KILLER_RABBIT("Killer Rabbit", Rarity.EPIC), - HORSE_CREAMY("Horse: Creamy", Rarity.RARE), - HORSE_CHESTNUT("Horse: Chestnut", Rarity.RARE), - HORSE_DARK_BROWN("Horse: Dark Brown", Rarity.RARE), - HORSE_GREY("Horse: Gray", Rarity.RARE), - DONKEY("Donkey", Rarity.RARE), - MULE("Mule", Rarity.RARE), + VILLAGER_BLACKSMITH("Villager: Blacksmith", Rarity.RARE), + VILLAGER_BLACKSMITH_BABY("Villager: Blacksmith (Baby)", Rarity.EPIC), + VILLAGER_BUTCHER("Villager: Butcher", Rarity.RARE), + VILLAGER_BUTCHER_BABY("Villager: Butcher (Baby)", Rarity.EPIC), VILLAGER_FARMER("Villager: Farmer", Rarity.RARE), + VILLAGER_FARMER_BABY("Villager: Farmer (Baby)", Rarity.EPIC), VILLAGER_LIBRARIAN("Villager: Librarian", Rarity.RARE), + VILLAGER_LIBRARIAN_BABY("Villager: Librarian (Baby)", Rarity.EPIC), VILLAGER_PRIEST("Villager: Priest", Rarity.RARE), - VILLAGER_BLACKSMITH("Villager: Blacksmith", Rarity.RARE), - VILLAGER_BUTCHER("Villager: Butcher", Rarity.RARE), - SHEEP_ORANGE("Sheep: Orange", Rarity.RARE), - SHEEP_MAGENTA("Sheep: Magenta", Rarity.RARE), - SHEEP_LIGHT_BLUE("Sheep: Light Blue", Rarity.RARE), - SHEEP_YELLOW("Sheep: Yellow", Rarity.RARE), - SHEEP_LIME("Sheep: Lime", Rarity.RARE), - SHEEP_CYAN("Sheep: Cyan", Rarity.RARE), - SHEEP_PURPLE("Sheep: Purple", Rarity.RARE), - SHEEP_BLUE("Sheep: Blue", Rarity.RARE), - SHEEP_GREEN("Sheep: Green", Rarity.RARE), - SHEEP_RED("Sheep: Red", Rarity.RARE), - CAVE_SPIDER("Cave Spider", Rarity.RARE), - SLIME_TINY("Slime (Tiny)", Rarity.RARE), - MAGMA_CUBE_TINY("Magma Cube (Tiny)", Rarity.EPIC), + VILLAGER_PRIEST_BABY("Villager: Priest (Baby)", Rarity.EPIC), + ZOMBIE_VILLAGER("Villager: Zombie", Rarity.EPIC), + WITCH("Witch", Rarity.EPIC), + + ZOMBIE("Zombie", Rarity.COMMON), ZOMBIE_BABY("Zombie (Baby)", Rarity.RARE), - PIG_BABY("Pig (Baby)", Rarity.RARE), - COW_BABY("Cow (Baby)", Rarity.RARE), - WOLF_BABY("Wolf (Baby)", Rarity.RARE), - CHICKEN_BABY("Chicken (Baby)", Rarity.RARE), - CAT_BLACK_BABY("Cat: Black (Baby)", Rarity.RARE), - CAT_RED_BABY("Cat: Red (Baby)", Rarity.RARE), - CAT_SIAMESE_BABY("Cat: Siamese (Baby)", Rarity.RARE), - BROWN_HORSE_BABY("Horse: Brown (Baby)", Rarity.RARE), - SHEEP_WHITE_BABY("Sheep: White (Baby)", Rarity.RARE), - SHEEP_GRAY_BABY("Sheep: Gray (Baby)", Rarity.RARE), - SHEEP_BROWN_BABY("Sheep: Brown (Baby)", Rarity.RARE), - SHEEP_SILVER_BABY("Sheep: Silver (Baby)", Rarity.RARE), + FROZEN_ZOMBIE("Frozen Zombie", Rarity.EPIC), + GROWING_ZOMBIE("Growing Zombie", Rarity.EPIC), + BURNING_ZOMBIE("Burning Zombie", Rarity.EPIC), + + RED_HELPER("Red Little Helper", Rarity.EPIC), + GREEN_HELPER("Green Little Helper", Rarity.EPIC), + + IRON_GOLEM("Golem", Rarity.LEGENDARY), + + ENDERMAN("Enderman", Rarity.LEGENDARY), + BLAZE("Blaze", Rarity.LEGENDARY), + + SNOWMAN("Snowman", Rarity.EPIC), + + HEROBRINE("Herobrine", Rarity.LEGENDARY), + + ENDERMITE("Endermite", Rarity.LEGENDARY), + + MINI_WITHER("Mini Wither", Rarity.LEGENDARY), + + CLONE("Clone", Rarity.LEGENDARY), + + MINECART("Minecart", Rarity.LEGENDARY), + + TNT("TNT", Rarity.LEGENDARY), + + GRINCH("Grinch", Rarity.LEGENDARY), + + BEE("Bee", Rarity.LEGENDARY), + + FIREFLY("Firefly", Rarity.LEGENDARY), + + CYCLOPS("Cyclops", Rarity.LEGENDARY), + SPIDER("Spider", Rarity.EPIC), - SKELETON("Skeleton", Rarity.EPIC), - HORSE_WHITE("Horse: White", Rarity.EPIC), - HORSE_BLACK("Horse: Black", Rarity.EPIC), - HORSE_UNDEAD("Undead Horse", Rarity.EPIC), - ZOMBIE_VILLAGER("Villager: Zombie", Rarity.EPIC), - PIG_ZOMBIE("Pig Zombie", Rarity.EPIC), - SHEEP_BLACK("Sheep: Black", Rarity.EPIC), - SHEEP_PINK("Sheep: Pink", Rarity.EPIC), - BAT("Bat", Rarity.EPIC), - SLIME_SMALL("Slime (Small)", Rarity.EPIC), - MAGMA_CUBE_SMALL("Magma Cube (Small)", Rarity.EPIC), + CAVE_SPIDER("Cave Spider", Rarity.RARE), + BOUNCY_SPIDER("Bouncy Spider", Rarity.LEGENDARY), + SPIDER_JOCKEY("Spider Jockey", Rarity.EPIC), + SNOWMAN_JOCKEY("Snowman Jockey", Rarity.LEGENDARY), + + CHICKEN("Chicken", Rarity.COMMON), + CHICKEN_BABY("Chicken (Baby)", Rarity.RARE), + CHICKEN_JOCKEY("Chicken Jockey", Rarity.LEGENDARY), + + COW("Cow", Rarity.COMMON), + COW_BABY("Cow (Baby)", Rarity.RARE), MOOSHROOM("Mooshroom", Rarity.EPIC), + MOOSHROOM_BABY("Mooshroom (Baby)", Rarity.LEGENDARY), + CREEPER("Creeper", Rarity.EPIC), - HORSE_CREAMY_BABY("Horse: Creamy (Baby)", Rarity.EPIC), + CREEPER_POWERED("Powered Creeper", Rarity.LEGENDARY), + + HORSE_BLACK("Horse: Black", Rarity.EPIC), + HORSE_BROWN("Horse: Brown", Rarity.COMMON), + HORSE_CHESTNUT("Horse: Chestnut", Rarity.RARE), + HORSE_CREAMY("Horse: Creamy", Rarity.RARE), + HORSE_DARK_BROWN("Horse: Dark Brown", Rarity.RARE), + HORSE_GREY("Horse: Gray", Rarity.RARE), + HORSE_WHITE("Horse: White", Rarity.EPIC), + BROWN_HORSE_BABY("Horse: Brown (Baby)", Rarity.RARE), HORSE_CHESTNUT_BABY("Horse: Chestnut (Baby)", Rarity.EPIC), + HORSE_CREAMY_BABY("Horse: Creamy (Baby)", Rarity.EPIC), HORSE_DARK_BROWN_BABY("Horse: Dark Brown (Baby)", Rarity.EPIC), HORSE_GRAY_BABY("Horse: Gray (Baby)", Rarity.EPIC), - VILLAGER_FARMER_BABY("Villager: Farmer (Baby)", Rarity.EPIC), - VILLAGER_LIBRARIAN_BABY("Villager: Librarian (Baby)", Rarity.EPIC), - VILLAGER_PRIEST_BABY("Villager: Priest (Baby)", Rarity.EPIC), - VILLAGER_BLACKSMITH_BABY("Villager: Blacksmith (Baby)", Rarity.EPIC), - VILLAGER_BUTCHER_BABY("Villager: Butcher (Baby)", Rarity.EPIC), - SHEEP_ORANGE_BABY("Sheep: Orange (Baby)", Rarity.EPIC), - SHEEP_MAGENTA_BABY("Sheep: Magenta (Baby)", Rarity.EPIC), + HORSE_UNDEAD("Undead Horse", Rarity.EPIC), + HORSE_SKELETON("Skeleton Horse", Rarity.LEGENDARY), + MULE("Mule", Rarity.RARE), + DONKEY("Donkey", Rarity.RARE), + + PIG("Pig", Rarity.COMMON), + PIG_BABY("Pig (Baby)", Rarity.RARE), + PIG_ZOMBIE("Pig Zombie", Rarity.EPIC), + PIG_ZOMBIE_BABY("Pig Zombie (Baby)", Rarity.LEGENDARY), + + SHEEP_BLACK("Sheep: Black", Rarity.EPIC), + SHEEP_BLACK_BABY("Sheep: Black (Baby)", Rarity.LEGENDARY), + SHEEP_BLUE("Sheep: Blue", Rarity.RARE), + SHEEP_BLUE_BABY("Sheep: Blue (Baby)", Rarity.EPIC), + SHEEP_BROWN("Sheep: Brown", Rarity.COMMON), + SHEEP_BROWN_BABY("Sheep: Brown (Baby)", Rarity.RARE), + SHEEP_CYAN("Sheep: Cyan", Rarity.RARE), + SHEEP_CYAN_BABY("Sheep: Cyan (Baby)", Rarity.EPIC), + SHEEP_GRAY("Sheep: Gray", Rarity.COMMON), + SHEEP_GRAY_BABY("Sheep: Gray (Baby)", Rarity.RARE), + SHEEP_GREEN("Sheep: Green", Rarity.RARE), + SHEEP_GREEN_BABY("Sheep: Green (Baby)", Rarity.EPIC), + SHEEP_LIGHT_BLUE("Sheep: Light Blue", Rarity.RARE), SHEEP_LIGHT_BLUE_BABY("Sheep: Light Blue (Baby)", Rarity.EPIC), - SHEEP_YELLOW_BABY("Sheep: Yellow (Baby)", Rarity.EPIC), + SHEEP_LIME("Sheep: Lime", Rarity.RARE), SHEEP_LIME_BABY("Sheep: Lime (Baby)", Rarity.EPIC), - SHEEP_CYAN_BABY("Sheep: Cyan (Baby)", Rarity.EPIC), + SHEEP_MAGENTA("Sheep: Magenta", Rarity.RARE), + SHEEP_MAGENTA_BABY("Sheep: Magenta (Baby)", Rarity.EPIC), + SHEEP_ORANGE("Sheep: Orange", Rarity.RARE), + SHEEP_ORANGE_BABY("Sheep: Orange (Baby)", Rarity.EPIC), + SHEEP_PINK("Sheep: Pink", Rarity.EPIC), + SHEEP_PINK_BABY("Sheep: Pink (Baby)", Rarity.LEGENDARY), + SHEEP_PURPLE("Sheep: Purple", Rarity.RARE), SHEEP_PURPLE_BABY("Sheep: Purple (Baby)", Rarity.EPIC), - SHEEP_BLUE_BABY("Sheep: Blue (Baby)", Rarity.EPIC), - SHEEP_GREEN_BABY("Sheep: Green (Baby)", Rarity.EPIC), + SHEEP_RED("Sheep: Red", Rarity.RARE), SHEEP_RED_BABY("Sheep: Red (Baby)", Rarity.EPIC), + SHEEP_SILVER("Sheep: Silver", Rarity.COMMON), + SHEEP_SILVER_BABY("Sheep: Silver (Baby)", Rarity.RARE), + SHEEP_WHITE("Sheep: White", Rarity.COMMON), + SHEEP_WHITE_BABY("Sheep: White (Baby)", Rarity.RARE), + SHEEP_YELLOW("Sheep: Yellow", Rarity.RARE), + SHEEP_YELLOW_BABY("Sheep: Yellow (Baby)", Rarity.EPIC), SHEEP_RAINBOW("Sheep: Rainbow", Rarity.LEGENDARY), - - IRON_GOLEM("Golem", Rarity.LEGENDARY), - ENDERMAN("Enderman", Rarity.LEGENDARY), - MOOSHROOM_BABY("Mooshroom (Baby)", Rarity.LEGENDARY), - PIG_ZOMBIE_BABY("Pig Zombie (Baby)", Rarity.LEGENDARY), - SHEEP_PINK_BABY("Sheep: Pink (Baby)", Rarity.LEGENDARY), - SHEEP_BLACK_BABY("Sheep: Black (Baby)", Rarity.LEGENDARY), - BLAZE("Blaze", Rarity.LEGENDARY), - WITCH("Witch", Rarity.EPIC), - HORSE_SKELETON("Skeleton Horse", Rarity.LEGENDARY), - SNOWMAN("Snowman", Rarity.EPIC), + BOUNCY_SHEEP("Bouncy Sheep", Rarity.EPIC), + MERRY_SHEEP("Merry Sheep", Rarity.EPIC), + SLIME_BIG("Slime (Big)", Rarity.LEGENDARY), + SLIME_SMALL("Slime (Small)", Rarity.EPIC), + SLIME_TINY("Slime (Tiny)", Rarity.RARE), MAGMA_CUBE_BIG("Magma Cube (Big)", Rarity.LEGENDARY), + MAGMA_CUBE_SMALL("Magma Cube (Small)", Rarity.EPIC), + MAGMA_CUBE_TINY("Magma Cube (Tiny)", Rarity.EPIC), + + SKELETON("Skeleton", Rarity.EPIC), WITHER_SKELETON("Wither Skeleton", Rarity.LEGENDARY), - - GREEN_HELPER("Green Little Helper", Rarity.EPIC), - RED_HELPER("Red Little Helper", Rarity.EPIC), - - WILD_OCELOT("Wild Ocelot"), - WILD_OCELOT_BABY("Wild Ocelot (Baby)"), + FROZEN_SKELETON("Frozen Skeleton", Rarity.EPIC), + SMOLDERING_SKELETON("Smoldering Skeleton", Rarity.EPIC), + + GUARDIAN("Guardian", Rarity.RARE), + ELDER_GUARDIAN("Elder Guardian", Rarity.LEGENDARY), SQUID("Squid"), + FLYING_SQUID("Flying Squid", Rarity.LEGENDARY); - BROWN_RABBIT("Rabbit: Brown", Rarity.RARE), - WHITE_RABBIT("Rabbit: White", Rarity.RARE), - BLACK_RABBIT("Rabbit: Black", Rarity.RARE), - BLACK_WHITE_RABBIT("Rabbit: Black & White", Rarity.EPIC), - GOLD_RABBIT("Rabbit: Gold", Rarity.EPIC), - SALT_PEPPER_RABBIT("Rabbit: Salt & Pepper", Rarity.EPIC), - HEROBRINE("Herobrine", Rarity.LEGENDARY), - CREEPER_POWERED("Powered Creeper", Rarity.LEGENDARY), - ENDERMITE("Endermite", Rarity.LEGENDARY); public static final PetType[] VALUES = values(); From 14ca24175c1f12c4e3d1d1aaed6b23a1afcf510f Mon Sep 17 00:00:00 2001 From: Picsou993 <33390780+Picsou993@users.noreply.github.com> Date: Sat, 11 Dec 2021 14:50:12 +0100 Subject: [PATCH 2/2] Add resource type * Add pets and companions to ResourceType. --- .../src/main/java/net/hypixel/api/util/ResourceType.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hypixel-api-core/src/main/java/net/hypixel/api/util/ResourceType.java b/hypixel-api-core/src/main/java/net/hypixel/api/util/ResourceType.java index 7b722784..bed5eda7 100644 --- a/hypixel-api-core/src/main/java/net/hypixel/api/util/ResourceType.java +++ b/hypixel-api-core/src/main/java/net/hypixel/api/util/ResourceType.java @@ -8,7 +8,9 @@ public enum ResourceType { GUILDS_ACHIEVEMENTS("guilds/achievements"), GUILDS_PERMISSION("guilds/permissions"), SKYBLOCK_COLLECTIONS("skyblock/collections"), - SKYBLOCK_SKILLS("skyblock/skills"); + SKYBLOCK_SKILLS("skyblock/skills"), + PETS("vanity/pets"), + COMPANIONS("vanity/companions"); /** * Path to resource