diff --git a/api/src/main/java/us/myles/ViaVersion/api/entities/Entity1_17Types.java b/api/src/main/java/us/myles/ViaVersion/api/entities/Entity1_17Types.java index ecfa4b845..694d5e693 100644 --- a/api/src/main/java/us/myles/ViaVersion/api/entities/Entity1_17Types.java +++ b/api/src/main/java/us/myles/ViaVersion/api/entities/Entity1_17Types.java @@ -35,15 +35,15 @@ public enum Entity1_17Types implements EntityType { EYE_OF_ENDER(26, ENTITY), FALLING_BLOCK(27, ENTITY), FIREWORK_ROCKET(28, ENTITY), - ITEM(40, ENTITY), - LLAMA_SPIT(46, ENTITY), - TNT(67, ENTITY), - SHULKER_BULLET(74, ENTITY), - FISHING_BOBBER(110, ENTITY), + ITEM(41, ENTITY), + LLAMA_SPIT(47, ENTITY), + TNT(68, ENTITY), + SHULKER_BULLET(75, ENTITY), + FISHING_BOBBER(111, ENTITY), LIVINGENTITY(-1, ENTITY), ARMOR_STAND(1, LIVINGENTITY), - PLAYER(109, LIVINGENTITY), + PLAYER(110, LIVINGENTITY), ABSTRACT_INSENTIENT(-1, LIVINGENTITY), ENDER_DRAGON(20, ABSTRACT_INSENTIENT), @@ -53,8 +53,8 @@ public enum Entity1_17Types implements EntityType { ABSTRACT_CREATURE(-1, ABSTRACT_INSENTIENT), ABSTRACT_AGEABLE(-1, ABSTRACT_CREATURE), - VILLAGER(96, ABSTRACT_AGEABLE), - WANDERING_TRADER(98, ABSTRACT_AGEABLE), + VILLAGER(97, ABSTRACT_AGEABLE), + WANDERING_TRADER(99, ABSTRACT_AGEABLE), // Animals ABSTRACT_ANIMAL(-1, ABSTRACT_AGEABLE), @@ -62,46 +62,47 @@ public enum Entity1_17Types implements EntityType { DOLPHIN(14, ABSTRACT_INSENTIENT), CHICKEN(10, ABSTRACT_ANIMAL), COW(12, ABSTRACT_ANIMAL), - MOOSHROOM(56, COW), - PANDA(59, ABSTRACT_INSENTIENT), - PIG(62, ABSTRACT_ANIMAL), - POLAR_BEAR(66, ABSTRACT_ANIMAL), - RABBIT(69, ABSTRACT_ANIMAL), - SHEEP(72, ABSTRACT_ANIMAL), - TURTLE(94, ABSTRACT_ANIMAL), + MOOSHROOM(57, COW), + PANDA(60, ABSTRACT_INSENTIENT), + PIG(63, ABSTRACT_ANIMAL), + POLAR_BEAR(67, ABSTRACT_ANIMAL), + RABBIT(70, ABSTRACT_ANIMAL), + SHEEP(73, ABSTRACT_ANIMAL), + TURTLE(95, ABSTRACT_ANIMAL), FOX(29, ABSTRACT_ANIMAL), + GOAT(34, ABSTRACT_ANIMAL), ABSTRACT_TAMEABLE_ANIMAL(-1, ABSTRACT_ANIMAL), CAT(8, ABSTRACT_TAMEABLE_ANIMAL), - OCELOT(57, ABSTRACT_TAMEABLE_ANIMAL), - WOLF(103, ABSTRACT_TAMEABLE_ANIMAL), + OCELOT(58, ABSTRACT_TAMEABLE_ANIMAL), + WOLF(104, ABSTRACT_TAMEABLE_ANIMAL), ABSTRACT_PARROT(-1, ABSTRACT_TAMEABLE_ANIMAL), - PARROT(60, ABSTRACT_PARROT), + PARROT(61, ABSTRACT_PARROT), // Horses ABSTRACT_HORSE(-1, ABSTRACT_ANIMAL), CHESTED_HORSE(-1, ABSTRACT_HORSE), DONKEY(15, CHESTED_HORSE), - MULE(55, CHESTED_HORSE), - LLAMA(45, CHESTED_HORSE), - TRADER_LLAMA(92, CHESTED_HORSE), - HORSE(36, ABSTRACT_HORSE), - SKELETON_HORSE(77, ABSTRACT_HORSE), - ZOMBIE_HORSE(106, ABSTRACT_HORSE), + MULE(56, CHESTED_HORSE), + LLAMA(46, CHESTED_HORSE), + TRADER_LLAMA(93, CHESTED_HORSE), + HORSE(37, ABSTRACT_HORSE), + SKELETON_HORSE(78, ABSTRACT_HORSE), + ZOMBIE_HORSE(107, ABSTRACT_HORSE), // Golem ABSTRACT_GOLEM(-1, ABSTRACT_CREATURE), - SNOW_GOLEM(80, ABSTRACT_GOLEM), - IRON_GOLEM(39, ABSTRACT_GOLEM), - SHULKER(73, ABSTRACT_GOLEM), + SNOW_GOLEM(81, ABSTRACT_GOLEM), + IRON_GOLEM(40, ABSTRACT_GOLEM), + SHULKER(74, ABSTRACT_GOLEM), // Fish ABSTRACT_FISHES(-1, ABSTRACT_CREATURE), COD(11, ABSTRACT_FISHES), - PUFFERFISH(68, ABSTRACT_FISHES), - SALMON(71, ABSTRACT_FISHES), - TROPICAL_FISH(93, ABSTRACT_FISHES), + PUFFERFISH(69, ABSTRACT_FISHES), + SALMON(72, ABSTRACT_FISHES), + TROPICAL_FISH(94, ABSTRACT_FISHES), // Monsters ABSTRACT_MONSTER(-1, ABSTRACT_CREATURE), @@ -110,107 +111,107 @@ public enum Entity1_17Types implements EntityType { ENDERMITE(22, ABSTRACT_MONSTER), ENDERMAN(21, ABSTRACT_MONSTER), GIANT(31, ABSTRACT_MONSTER), - SILVERFISH(75, ABSTRACT_MONSTER), - VEX(95, ABSTRACT_MONSTER), - WITCH(99, ABSTRACT_MONSTER), - WITHER(100, ABSTRACT_MONSTER), - RAVAGER(70, ABSTRACT_MONSTER), + SILVERFISH(76, ABSTRACT_MONSTER), + VEX(96, ABSTRACT_MONSTER), + WITCH(100, ABSTRACT_MONSTER), + WITHER(101, ABSTRACT_MONSTER), + RAVAGER(71, ABSTRACT_MONSTER), ABSTRACT_PIGLIN(-1, ABSTRACT_MONSTER), - PIGLIN(63, ABSTRACT_PIGLIN), - PIGLIN_BRUTE(64, ABSTRACT_PIGLIN), + PIGLIN(64, ABSTRACT_PIGLIN), + PIGLIN_BRUTE(65, ABSTRACT_PIGLIN), - HOGLIN(35, ABSTRACT_ANIMAL), - STRIDER(86, ABSTRACT_ANIMAL), - ZOGLIN(104, ABSTRACT_MONSTER), + HOGLIN(36, ABSTRACT_ANIMAL), + STRIDER(87, ABSTRACT_ANIMAL), + ZOGLIN(105, ABSTRACT_MONSTER), // Illagers ABSTRACT_ILLAGER_BASE(-1, ABSTRACT_MONSTER), ABSTRACT_EVO_ILLU_ILLAGER(-1, ABSTRACT_ILLAGER_BASE), EVOKER(23, ABSTRACT_EVO_ILLU_ILLAGER), - ILLUSIONER(38, ABSTRACT_EVO_ILLU_ILLAGER), - VINDICATOR(97, ABSTRACT_ILLAGER_BASE), - PILLAGER(65, ABSTRACT_ILLAGER_BASE), + ILLUSIONER(39, ABSTRACT_EVO_ILLU_ILLAGER), + VINDICATOR(98, ABSTRACT_ILLAGER_BASE), + PILLAGER(66, ABSTRACT_ILLAGER_BASE), // Skeletons ABSTRACT_SKELETON(-1, ABSTRACT_MONSTER), - SKELETON(76, ABSTRACT_SKELETON), - STRAY(85, ABSTRACT_SKELETON), - WITHER_SKELETON(101, ABSTRACT_SKELETON), + SKELETON(77, ABSTRACT_SKELETON), + STRAY(86, ABSTRACT_SKELETON), + WITHER_SKELETON(102, ABSTRACT_SKELETON), // Guardians - GUARDIAN(34, ABSTRACT_MONSTER), + GUARDIAN(35, ABSTRACT_MONSTER), ELDER_GUARDIAN(18, GUARDIAN), // Spiders - SPIDER(83, ABSTRACT_MONSTER), + SPIDER(84, ABSTRACT_MONSTER), CAVE_SPIDER(9, SPIDER), // Zombies - ZOMBIE(105, ABSTRACT_MONSTER), + ZOMBIE(106, ABSTRACT_MONSTER), DROWNED(17, ZOMBIE), - HUSK(37, ZOMBIE), - ZOMBIFIED_PIGLIN(108, ZOMBIE), - ZOMBIE_VILLAGER(107, ZOMBIE), + HUSK(38, ZOMBIE), + ZOMBIFIED_PIGLIN(109, ZOMBIE), + ZOMBIE_VILLAGER(108, ZOMBIE), // Flying entities ABSTRACT_FLYING(-1, ABSTRACT_INSENTIENT), GHAST(30, ABSTRACT_FLYING), - PHANTOM(61, ABSTRACT_FLYING), + PHANTOM(62, ABSTRACT_FLYING), ABSTRACT_AMBIENT(-1, ABSTRACT_INSENTIENT), BAT(4, ABSTRACT_AMBIENT), ABSTRACT_WATERMOB(-1, ABSTRACT_INSENTIENT), - SQUID(84, ABSTRACT_WATERMOB), + SQUID(85, ABSTRACT_WATERMOB), GLOW_SQUID(33, SQUID), // Slimes - SLIME(78, ABSTRACT_INSENTIENT), - MAGMA_CUBE(47, SLIME), + SLIME(79, ABSTRACT_INSENTIENT), + MAGMA_CUBE(48, SLIME), // Hangable objects ABSTRACT_HANGING(-1, ENTITY), - LEASH_KNOT(43, ABSTRACT_HANGING), - ITEM_FRAME(41, ABSTRACT_HANGING), + LEASH_KNOT(44, ABSTRACT_HANGING), + ITEM_FRAME(42, ABSTRACT_HANGING), GLOW_ITEM_FRAME(32, ITEM_FRAME), - PAINTING(58, ABSTRACT_HANGING), + PAINTING(59, ABSTRACT_HANGING), ABSTRACT_LIGHTNING(-1, ENTITY), - LIGHTNING_BOLT(44, ABSTRACT_LIGHTNING), + LIGHTNING_BOLT(45, ABSTRACT_LIGHTNING), // Arrows ABSTRACT_ARROW(-1, ENTITY), ARROW(2, ABSTRACT_ARROW), - SPECTRAL_ARROW(82, ABSTRACT_ARROW), - TRIDENT(91, ABSTRACT_ARROW), + SPECTRAL_ARROW(83, ABSTRACT_ARROW), + TRIDENT(92, ABSTRACT_ARROW), // Fireballs ABSTRACT_FIREBALL(-1, ENTITY), DRAGON_FIREBALL(16, ABSTRACT_FIREBALL), - FIREBALL(42, ABSTRACT_FIREBALL), - SMALL_FIREBALL(79, ABSTRACT_FIREBALL), - WITHER_SKULL(102, ABSTRACT_FIREBALL), + FIREBALL(43, ABSTRACT_FIREBALL), + SMALL_FIREBALL(80, ABSTRACT_FIREBALL), + WITHER_SKULL(103, ABSTRACT_FIREBALL), // Projectiles PROJECTILE_ABSTRACT(-1, ENTITY), - SNOWBALL(81, PROJECTILE_ABSTRACT), - ENDER_PEARL(88, PROJECTILE_ABSTRACT), - EGG(87, PROJECTILE_ABSTRACT), - POTION(90, PROJECTILE_ABSTRACT), - EXPERIENCE_BOTTLE(89, PROJECTILE_ABSTRACT), + SNOWBALL(82, PROJECTILE_ABSTRACT), + ENDER_PEARL(89, PROJECTILE_ABSTRACT), + EGG(88, PROJECTILE_ABSTRACT), + POTION(91, PROJECTILE_ABSTRACT), + EXPERIENCE_BOTTLE(90, PROJECTILE_ABSTRACT), // Vehicles MINECART_ABSTRACT(-1, ENTITY), CHESTED_MINECART_ABSTRACT(-1, MINECART_ABSTRACT), - CHEST_MINECART(49, CHESTED_MINECART_ABSTRACT), - HOPPER_MINECART(52, CHESTED_MINECART_ABSTRACT), - MINECART(48, MINECART_ABSTRACT), - FURNACE_MINECART(51, MINECART_ABSTRACT), - COMMAND_BLOCK_MINECART(50, MINECART_ABSTRACT), - TNT_MINECART(54, MINECART_ABSTRACT), - SPAWNER_MINECART(53, MINECART_ABSTRACT), + CHEST_MINECART(50, CHESTED_MINECART_ABSTRACT), + HOPPER_MINECART(53, CHESTED_MINECART_ABSTRACT), + MINECART(49, MINECART_ABSTRACT), + FURNACE_MINECART(52, MINECART_ABSTRACT), + COMMAND_BLOCK_MINECART(51, MINECART_ABSTRACT), + TNT_MINECART(55, MINECART_ABSTRACT), + SPAWNER_MINECART(54, MINECART_ABSTRACT), BOAT(7, ENTITY); private static final EntityType[] TYPES;