From 898521de9a3d4b19996b1482b784d963125b6d9c Mon Sep 17 00:00:00 2001 From: KennyTV Date: Wed, 14 Apr 2021 15:40:48 +0200 Subject: [PATCH] 21w15a --- .../api/entities/Entity1_17Types.java | 127 +- .../api/protocol/ProtocolVersion.java | 2 +- build.gradle.kts | 2 +- .../Protocol1_17To1_16_4.java | 1 + .../assets/viaversion/data/mapping-1.17.json | 2190 +++++++++-------- 5 files changed, 1170 insertions(+), 1152 deletions(-) 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 694d5e693..78b73ed5d 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 @@ -37,13 +37,14 @@ public enum Entity1_17Types implements EntityType { FIREWORK_ROCKET(28, ENTITY), ITEM(41, ENTITY), LLAMA_SPIT(47, ENTITY), - TNT(68, ENTITY), - SHULKER_BULLET(75, ENTITY), - FISHING_BOBBER(111, ENTITY), + TNT(69, ENTITY), + SHULKER_BULLET(76, ENTITY), + FISHING_BOBBER(112, ENTITY), LIVINGENTITY(-1, ENTITY), ARMOR_STAND(1, LIVINGENTITY), - PLAYER(110, LIVINGENTITY), + MARKER(49, ENTITY), + PLAYER(111, LIVINGENTITY), ABSTRACT_INSENTIENT(-1, LIVINGENTITY), ENDER_DRAGON(20, ABSTRACT_INSENTIENT), @@ -53,8 +54,8 @@ public enum Entity1_17Types implements EntityType { ABSTRACT_CREATURE(-1, ABSTRACT_INSENTIENT), ABSTRACT_AGEABLE(-1, ABSTRACT_CREATURE), - VILLAGER(97, ABSTRACT_AGEABLE), - WANDERING_TRADER(99, ABSTRACT_AGEABLE), + VILLAGER(98, ABSTRACT_AGEABLE), + WANDERING_TRADER(100, ABSTRACT_AGEABLE), // Animals ABSTRACT_ANIMAL(-1, ABSTRACT_AGEABLE), @@ -62,47 +63,47 @@ public enum Entity1_17Types implements EntityType { DOLPHIN(14, ABSTRACT_INSENTIENT), CHICKEN(10, ABSTRACT_ANIMAL), COW(12, 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), + MOOSHROOM(58, COW), + PANDA(61, ABSTRACT_INSENTIENT), + PIG(64, ABSTRACT_ANIMAL), + POLAR_BEAR(68, ABSTRACT_ANIMAL), + RABBIT(71, ABSTRACT_ANIMAL), + SHEEP(74, ABSTRACT_ANIMAL), + TURTLE(96, ABSTRACT_ANIMAL), FOX(29, ABSTRACT_ANIMAL), GOAT(34, ABSTRACT_ANIMAL), ABSTRACT_TAMEABLE_ANIMAL(-1, ABSTRACT_ANIMAL), CAT(8, ABSTRACT_TAMEABLE_ANIMAL), - OCELOT(58, ABSTRACT_TAMEABLE_ANIMAL), - WOLF(104, ABSTRACT_TAMEABLE_ANIMAL), + OCELOT(59, ABSTRACT_TAMEABLE_ANIMAL), + WOLF(105, ABSTRACT_TAMEABLE_ANIMAL), ABSTRACT_PARROT(-1, ABSTRACT_TAMEABLE_ANIMAL), - PARROT(61, ABSTRACT_PARROT), + PARROT(62, ABSTRACT_PARROT), // Horses ABSTRACT_HORSE(-1, ABSTRACT_ANIMAL), CHESTED_HORSE(-1, ABSTRACT_HORSE), DONKEY(15, CHESTED_HORSE), - MULE(56, CHESTED_HORSE), + MULE(57, CHESTED_HORSE), LLAMA(46, CHESTED_HORSE), - TRADER_LLAMA(93, CHESTED_HORSE), + TRADER_LLAMA(94, CHESTED_HORSE), HORSE(37, ABSTRACT_HORSE), - SKELETON_HORSE(78, ABSTRACT_HORSE), - ZOMBIE_HORSE(107, ABSTRACT_HORSE), + SKELETON_HORSE(79, ABSTRACT_HORSE), + ZOMBIE_HORSE(108, ABSTRACT_HORSE), // Golem ABSTRACT_GOLEM(-1, ABSTRACT_CREATURE), - SNOW_GOLEM(81, ABSTRACT_GOLEM), + SNOW_GOLEM(82, ABSTRACT_GOLEM), IRON_GOLEM(40, ABSTRACT_GOLEM), - SHULKER(74, ABSTRACT_GOLEM), + SHULKER(75, ABSTRACT_GOLEM), // Fish ABSTRACT_FISHES(-1, ABSTRACT_CREATURE), COD(11, ABSTRACT_FISHES), - PUFFERFISH(69, ABSTRACT_FISHES), - SALMON(72, ABSTRACT_FISHES), - TROPICAL_FISH(94, ABSTRACT_FISHES), + PUFFERFISH(70, ABSTRACT_FISHES), + SALMON(73, ABSTRACT_FISHES), + TROPICAL_FISH(95, ABSTRACT_FISHES), // Monsters ABSTRACT_MONSTER(-1, ABSTRACT_CREATURE), @@ -111,64 +112,64 @@ public enum Entity1_17Types implements EntityType { ENDERMITE(22, ABSTRACT_MONSTER), ENDERMAN(21, ABSTRACT_MONSTER), GIANT(31, ABSTRACT_MONSTER), - SILVERFISH(76, ABSTRACT_MONSTER), - VEX(96, ABSTRACT_MONSTER), - WITCH(100, ABSTRACT_MONSTER), - WITHER(101, ABSTRACT_MONSTER), - RAVAGER(71, ABSTRACT_MONSTER), + SILVERFISH(77, ABSTRACT_MONSTER), + VEX(97, ABSTRACT_MONSTER), + WITCH(101, ABSTRACT_MONSTER), + WITHER(102, ABSTRACT_MONSTER), + RAVAGER(72, ABSTRACT_MONSTER), ABSTRACT_PIGLIN(-1, ABSTRACT_MONSTER), - PIGLIN(64, ABSTRACT_PIGLIN), - PIGLIN_BRUTE(65, ABSTRACT_PIGLIN), + PIGLIN(65, ABSTRACT_PIGLIN), + PIGLIN_BRUTE(66, ABSTRACT_PIGLIN), HOGLIN(36, ABSTRACT_ANIMAL), - STRIDER(87, ABSTRACT_ANIMAL), - ZOGLIN(105, ABSTRACT_MONSTER), + STRIDER(88, ABSTRACT_ANIMAL), + ZOGLIN(106, ABSTRACT_MONSTER), // Illagers ABSTRACT_ILLAGER_BASE(-1, ABSTRACT_MONSTER), ABSTRACT_EVO_ILLU_ILLAGER(-1, ABSTRACT_ILLAGER_BASE), EVOKER(23, ABSTRACT_EVO_ILLU_ILLAGER), ILLUSIONER(39, ABSTRACT_EVO_ILLU_ILLAGER), - VINDICATOR(98, ABSTRACT_ILLAGER_BASE), - PILLAGER(66, ABSTRACT_ILLAGER_BASE), + VINDICATOR(99, ABSTRACT_ILLAGER_BASE), + PILLAGER(67, ABSTRACT_ILLAGER_BASE), // Skeletons ABSTRACT_SKELETON(-1, ABSTRACT_MONSTER), - SKELETON(77, ABSTRACT_SKELETON), - STRAY(86, ABSTRACT_SKELETON), - WITHER_SKELETON(102, ABSTRACT_SKELETON), + SKELETON(78, ABSTRACT_SKELETON), + STRAY(87, ABSTRACT_SKELETON), + WITHER_SKELETON(103, ABSTRACT_SKELETON), // Guardians GUARDIAN(35, ABSTRACT_MONSTER), ELDER_GUARDIAN(18, GUARDIAN), // Spiders - SPIDER(84, ABSTRACT_MONSTER), + SPIDER(85, ABSTRACT_MONSTER), CAVE_SPIDER(9, SPIDER), // Zombies - ZOMBIE(106, ABSTRACT_MONSTER), + ZOMBIE(107, ABSTRACT_MONSTER), DROWNED(17, ZOMBIE), HUSK(38, ZOMBIE), - ZOMBIFIED_PIGLIN(109, ZOMBIE), - ZOMBIE_VILLAGER(108, ZOMBIE), + ZOMBIFIED_PIGLIN(110, ZOMBIE), + ZOMBIE_VILLAGER(109, ZOMBIE), // Flying entities ABSTRACT_FLYING(-1, ABSTRACT_INSENTIENT), GHAST(30, ABSTRACT_FLYING), - PHANTOM(62, ABSTRACT_FLYING), + PHANTOM(63, ABSTRACT_FLYING), ABSTRACT_AMBIENT(-1, ABSTRACT_INSENTIENT), BAT(4, ABSTRACT_AMBIENT), ABSTRACT_WATERMOB(-1, ABSTRACT_INSENTIENT), - SQUID(85, ABSTRACT_WATERMOB), + SQUID(86, ABSTRACT_WATERMOB), GLOW_SQUID(33, SQUID), // Slimes - SLIME(79, ABSTRACT_INSENTIENT), + SLIME(80, ABSTRACT_INSENTIENT), MAGMA_CUBE(48, SLIME), // Hangable objects @@ -176,7 +177,7 @@ public enum Entity1_17Types implements EntityType { LEASH_KNOT(44, ABSTRACT_HANGING), ITEM_FRAME(42, ABSTRACT_HANGING), GLOW_ITEM_FRAME(32, ITEM_FRAME), - PAINTING(59, ABSTRACT_HANGING), + PAINTING(60, ABSTRACT_HANGING), ABSTRACT_LIGHTNING(-1, ENTITY), LIGHTNING_BOLT(45, ABSTRACT_LIGHTNING), @@ -184,34 +185,34 @@ public enum Entity1_17Types implements EntityType { // Arrows ABSTRACT_ARROW(-1, ENTITY), ARROW(2, ABSTRACT_ARROW), - SPECTRAL_ARROW(83, ABSTRACT_ARROW), - TRIDENT(92, ABSTRACT_ARROW), + SPECTRAL_ARROW(84, ABSTRACT_ARROW), + TRIDENT(93, ABSTRACT_ARROW), // Fireballs ABSTRACT_FIREBALL(-1, ENTITY), DRAGON_FIREBALL(16, ABSTRACT_FIREBALL), FIREBALL(43, ABSTRACT_FIREBALL), - SMALL_FIREBALL(80, ABSTRACT_FIREBALL), - WITHER_SKULL(103, ABSTRACT_FIREBALL), + SMALL_FIREBALL(81, ABSTRACT_FIREBALL), + WITHER_SKULL(104, ABSTRACT_FIREBALL), // Projectiles PROJECTILE_ABSTRACT(-1, ENTITY), - SNOWBALL(82, PROJECTILE_ABSTRACT), - ENDER_PEARL(89, PROJECTILE_ABSTRACT), - EGG(88, PROJECTILE_ABSTRACT), - POTION(91, PROJECTILE_ABSTRACT), - EXPERIENCE_BOTTLE(90, PROJECTILE_ABSTRACT), + SNOWBALL(83, PROJECTILE_ABSTRACT), + ENDER_PEARL(90, PROJECTILE_ABSTRACT), + EGG(89, PROJECTILE_ABSTRACT), + POTION(92, PROJECTILE_ABSTRACT), + EXPERIENCE_BOTTLE(91, PROJECTILE_ABSTRACT), // Vehicles MINECART_ABSTRACT(-1, ENTITY), CHESTED_MINECART_ABSTRACT(-1, 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), + CHEST_MINECART(51, CHESTED_MINECART_ABSTRACT), + HOPPER_MINECART(54, CHESTED_MINECART_ABSTRACT), + MINECART(50, MINECART_ABSTRACT), + FURNACE_MINECART(53, MINECART_ABSTRACT), + COMMAND_BLOCK_MINECART(52, MINECART_ABSTRACT), + TNT_MINECART(56, MINECART_ABSTRACT), + SPAWNER_MINECART(55, MINECART_ABSTRACT), BOAT(7, ENTITY); private static final EntityType[] TYPES; diff --git a/api/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolVersion.java b/api/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolVersion.java index 7b7d869aa..e0c120197 100644 --- a/api/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolVersion.java +++ b/api/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolVersion.java @@ -76,7 +76,7 @@ public class ProtocolVersion { public static final ProtocolVersion v1_16_2 = register(751, "1.16.2"); public static final ProtocolVersion v1_16_3 = register(753, "1.16.3"); public static final ProtocolVersion v1_16_4 = register(754, "1.16.4/5", new VersionRange("1.16", 4, 5)); - public static final ProtocolVersion v1_17 = register(755, 21, "1.17"); + public static final ProtocolVersion v1_17 = register(755, 22, "1.17"); public static final ProtocolVersion unknown = register(-1, "UNKNOWN"); public static ProtocolVersion register(int version, String name) { diff --git a/build.gradle.kts b/build.gradle.kts index 8571668f2..77d156332 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -8,7 +8,7 @@ plugins { allprojects { group = "us.myles" - version = "3.3.0-21w14a" + version = "3.3.0-21w15a" description = "Allow newer clients to join older server versions." } diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_17to1_16_4/Protocol1_17To1_16_4.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_17to1_16_4/Protocol1_17To1_16_4.java index 6f0ed1cef..bb14bc499 100644 --- a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_17to1_16_4/Protocol1_17To1_16_4.java +++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_17to1_16_4/Protocol1_17To1_16_4.java @@ -101,6 +101,7 @@ public class Protocol1_17To1_16_4 extends Protocol