diff --git a/bukkit/pom.xml b/bukkit/pom.xml
index 9b483cd2b..a5791ef85 100644
--- a/bukkit/pom.xml
+++ b/bukkit/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>viaversion-parent</artifactId>
         <groupId>us.myles</groupId>
-        <version>2.0.0-19w04b</version>
+        <version>2.0.0-19w05a</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/bungee/pom.xml b/bungee/pom.xml
index 2a578acf5..7e86a5888 100644
--- a/bungee/pom.xml
+++ b/bungee/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>viaversion-parent</artifactId>
         <groupId>us.myles</groupId>
-        <version>2.0.0-19w04b</version>
+        <version>2.0.0-19w05a</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/common/pom.xml b/common/pom.xml
index 3728b9bd6..6bea85b39 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>viaversion-parent</artifactId>
         <groupId>us.myles</groupId>
-        <version>2.0.0-19w04b</version>
+        <version>2.0.0-19w05a</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/common/src/main/java/us/myles/ViaVersion/api/entities/Entity1_14Types.java b/common/src/main/java/us/myles/ViaVersion/api/entities/Entity1_14Types.java
index b329b3045..103c7f57d 100644
--- a/common/src/main/java/us/myles/ViaVersion/api/entities/Entity1_14Types.java
+++ b/common/src/main/java/us/myles/ViaVersion/api/entities/Entity1_14Types.java
@@ -36,11 +36,11 @@ public class Entity1_14Types {
         LLAMA_SPIT(38, ENTITY),
         TNT(57, ENTITY),
         SHULKER_BULLET(62, ENTITY),
-        FISHING_BOBBER(97, ENTITY),
+        FISHING_BOBBER(100, ENTITY),
 
         LIVINGENTITY(-1, ENTITY),
         ARMOR_STAND(1, LIVINGENTITY),
-        PLAYER(96, LIVINGENTITY),
+        PLAYER(99, LIVINGENTITY),
 
         ABSTRACT_INSENTIENT(-1, LIVINGENTITY),
         ENDER_DRAGON(18, ABSTRACT_INSENTIENT),
@@ -48,7 +48,8 @@ public class Entity1_14Types {
         ABSTRACT_CREATURE(-1, ABSTRACT_INSENTIENT),
 
         ABSTRACT_AGEABLE(-1, ABSTRACT_CREATURE),
-        VILLAGER(81, ABSTRACT_AGEABLE),
+        VILLAGER(83, ABSTRACT_AGEABLE),
+        WANDERING_TRADER(87, ABSTRACT_AGEABLE),
 
         // Animals
         ABSTRACT_ANIMAL(-1, ABSTRACT_AGEABLE),
@@ -60,12 +61,12 @@ public class Entity1_14Types {
         POLAR_BEAR(56, ABSTRACT_ANIMAL),
         RABBIT(58, ABSTRACT_ANIMAL),
         SHEEP(60, ABSTRACT_ANIMAL),
-        TURTLE(75, ABSTRACT_ANIMAL),
+        TURTLE(76, ABSTRACT_ANIMAL),
 
         ABSTRACT_TAMEABLE_ANIMAL(-1, ABSTRACT_ANIMAL),
         CAT(6, ABSTRACT_TAMEABLE_ANIMAL),
         OCELOT(49, ABSTRACT_TAMEABLE_ANIMAL),
-        WOLF(89, ABSTRACT_TAMEABLE_ANIMAL),
+        WOLF(92, ABSTRACT_TAMEABLE_ANIMAL),
 
         ABSTRACT_PARROT(-1, ABSTRACT_TAMEABLE_ANIMAL),
         PARROT(52, ABSTRACT_PARROT),
@@ -76,14 +77,15 @@ public class Entity1_14Types {
         DONKEY(12, CHESTED_HORSE),
         MULE(47, CHESTED_HORSE),
         LLAMA(37, CHESTED_HORSE),
+        TRADER_LLAMA(74, CHESTED_HORSE),
         HORSE(30, ABSTRACT_HORSE),
         SKELETON_HORSE(65, ABSTRACT_HORSE),
-        ZOMBIE_HORSE(91, ABSTRACT_HORSE),
+        ZOMBIE_HORSE(94, ABSTRACT_HORSE),
 
         // Golem
         ABSTRACT_GOLEM(-1, ABSTRACT_CREATURE),
         SNOWMAN(68, ABSTRACT_GOLEM),
-        VILLAGER_GOLEM(82, ABSTRACT_GOLEM),
+        VILLAGER_GOLEM(84, ABSTRACT_GOLEM),
         SHULKER(61, ABSTRACT_GOLEM),
 
         // Fish
@@ -91,7 +93,7 @@ public class Entity1_14Types {
         COD(9, ABSTRACT_FISHES),
         PUFFER_FISH(54, ABSTRACT_FISHES),
         SALMON_MOB(59, ABSTRACT_FISHES),
-        TROPICAL_FISH(74, ABSTRACT_FISHES),
+        TROPICAL_FISH(75, ABSTRACT_FISHES),
 
         // Monsters
         ABSTRACT_MONSTER(-1, ABSTRACT_CREATURE),
@@ -101,22 +103,24 @@ public class Entity1_14Types {
         ENDERMAN(19, ABSTRACT_MONSTER),
         GIANT(28, ABSTRACT_MONSTER),
         SILVERFISH(63, ABSTRACT_MONSTER),
-        VEX(80, ABSTRACT_MONSTER),
-        WITCH(85, ABSTRACT_MONSTER),
-        WITHER(86, ABSTRACT_MONSTER),
+        VEX(82, ABSTRACT_MONSTER),
+        WITCH(88, ABSTRACT_MONSTER),
+        WITHER(89, ABSTRACT_MONSTER),
+        RAVAGER(97, ABSTRACT_MONSTER),
 
         // Illagers
         ABSTRACT_ILLAGER_BASE(-1, ABSTRACT_MONSTER),
         ABSTRACT_EVO_ILLU_ILLAGER(-1, ABSTRACT_ILLAGER_BASE),
         EVOCATION_ILLAGER(22, ABSTRACT_EVO_ILLU_ILLAGER),
         ILLUSION_ILLAGER(32, ABSTRACT_EVO_ILLU_ILLAGER),
-        VINDICATION_ILLAGER(83, ABSTRACT_ILLAGER_BASE),
+        VINDICATION_ILLAGER(85, ABSTRACT_ILLAGER_BASE),
+        PILLAGER(86, ABSTRACT_ILLAGER_BASE),
 
         // Skeletons
         ABSTRACT_SKELETON(-1, ABSTRACT_MONSTER),
         SKELETON(64, ABSTRACT_SKELETON),
         STRAY(73, ABSTRACT_SKELETON),
-        WITHER_SKELETON(87, ABSTRACT_SKELETON),
+        WITHER_SKELETON(90, ABSTRACT_SKELETON),
 
         // Guardians
         GUARDIAN(29, ABSTRACT_MONSTER),
@@ -127,16 +131,16 @@ public class Entity1_14Types {
         CAVE_SPIDER(7, SPIDER),
 
         // Zombies - META CHECKED
-        ZOMBIE(90, ABSTRACT_MONSTER),
+        ZOMBIE(93, ABSTRACT_MONSTER),
         DROWNED(15, ZOMBIE),
         HUSK(31, ZOMBIE),
         ZOMBIE_PIGMAN(55, ZOMBIE),
-        ZOMBIE_VILLAGER(92, ZOMBIE),
+        ZOMBIE_VILLAGER(95, ZOMBIE),
 
         // Flying entities
         ABSTRACT_FLYING(-1, ABSTRACT_INSENTIENT),
         GHAST(27, ABSTRACT_FLYING),
-        PHANTOM(93, ABSTRACT_FLYING),
+        PHANTOM(96, ABSTRACT_FLYING),
 
         ABSTRACT_AMBIENT(-1, ABSTRACT_INSENTIENT),
         BAT(3, ABSTRACT_AMBIENT),
@@ -155,28 +159,28 @@ public class Entity1_14Types {
         PAINTING(50, ABSTRACT_HANGING),
 
         ABSTRACT_LIGHTNING(-1, ENTITY),
-        LIGHTNING_BOLT(95, ABSTRACT_LIGHTNING),
+        LIGHTNING_BOLT(98, ABSTRACT_LIGHTNING),
 
         // Arrows
         ABSTRACT_ARROW(-1, ENTITY),
         ARROW(2, ABSTRACT_ARROW),
         SPECTRAL_ARROW(70, ABSTRACT_ARROW),
-        TRIDENT(98, ABSTRACT_ARROW),
+        TRIDENT(81, ABSTRACT_ARROW),
 
         // Fireballs
         ABSTRACT_FIREBALL(-1, ENTITY),
         DRAGON_FIREBALL(14, ABSTRACT_FIREBALL),
         FIREBALL(35, ABSTRACT_FIREBALL),
         SMALL_FIREBALL(67, ABSTRACT_FIREBALL),
-        WITHER_SKULL(88, ABSTRACT_FIREBALL),
+        WITHER_SKULL(91, ABSTRACT_FIREBALL),
 
         // Projectiles
         PROJECTILE_ABSTRACT(-1, ENTITY),
         SNOWBALL(69, PROJECTILE_ABSTRACT),
-        ENDER_PEARL(77, PROJECTILE_ABSTRACT),
-        EGG(76, PROJECTILE_ABSTRACT),
-        POTION(79, PROJECTILE_ABSTRACT),
-        XP_BOTTLE(78, PROJECTILE_ABSTRACT),
+        ENDER_PEARL(78, PROJECTILE_ABSTRACT),
+        EGG(77, PROJECTILE_ABSTRACT),
+        POTION(80, PROJECTILE_ABSTRACT),
+        XP_BOTTLE(79, PROJECTILE_ABSTRACT),
 
         // Vehicles
         MINECART_ABSTRACT(-1, ENTITY),
diff --git a/common/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolVersion.java b/common/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolVersion.java
index 5f3ab8268..7433c65a8 100644
--- a/common/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolVersion.java
+++ b/common/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolVersion.java
@@ -67,7 +67,7 @@ public class ProtocolVersion {
         register(v1_13 = new ProtocolVersion(393, "1.13"));
         register(v1_13_1 = new ProtocolVersion(401, "1.13.1"));
         register(v1_13_2 = new ProtocolVersion(404, "1.13.2"));
-        register(v1_14 = new ProtocolVersion(457, "1.14"));
+        register(v1_14 = new ProtocolVersion(458, "1.14"));
         register(unknown = new ProtocolVersion(-1, "UNKNOWN"));
     }
 
diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_14to1_13_2/packets/EntityPackets.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_14to1_13_2/packets/EntityPackets.java
index 4156131bc..e57212213 100644
--- a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_14to1_13_2/packets/EntityPackets.java
+++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_14to1_13_2/packets/EntityPackets.java
@@ -27,7 +27,7 @@ public class EntityPackets {
             public void registerMap() {
                 map(Type.VAR_INT); // 0 - Entity id
                 map(Type.UUID); // 1 - UUID
-                map(Type.BYTE); // 2 - Type
+                map(Type.BYTE, Type.VAR_INT); // 2 - Type
                 map(Type.DOUBLE); // 3 - X
                 map(Type.DOUBLE); // 4 - Y
                 map(Type.DOUBLE); // 5 - Z
@@ -41,7 +41,7 @@ public class EntityPackets {
                     public void handle(PacketWrapper wrapper) throws Exception {
                         int entityId = wrapper.get(Type.VAR_INT, 0);
                         UUID uuid = wrapper.get(Type.UUID, 0);
-                        byte type = wrapper.get(Type.BYTE, 0);
+                        int type = wrapper.get(Type.VAR_INT, 1);
                         Entity1_14Types.EntityType entType = Entity1_14Types.getTypeFromId(type, true);
 
                         if (entType != null) {
@@ -49,7 +49,11 @@ public class EntityPackets {
                                 int data = wrapper.get(Type.INT, 0);
                                 wrapper.set(Type.INT, 0, Protocol1_14To1_13_2.getNewBlockStateId(data));
                             }
+
+                            type = entType.getId();
                         }
+
+                        wrapper.set(Type.VAR_INT, 1, type);
                         // Register Type ID
                         wrapper.user().get(EntityTracker.class).addEntity(entityId, uuid, entType);
                     }
diff --git a/common/src/main/resources/assets/viaversion/data/mapping-1.14.json b/common/src/main/resources/assets/viaversion/data/mapping-1.14.json
index dc49cfb5a..12ac9c6a3 100644
--- a/common/src/main/resources/assets/viaversion/data/mapping-1.14.json
+++ b/common/src/main/resources/assets/viaversion/data/mapping-1.14.json
@@ -11669,7 +11669,7 @@
     "711": "minecraft:guardian_spawn_egg",
     "712": "minecraft:horse_spawn_egg",
     "713": "minecraft:husk_spawn_egg",
-    "714": "minecraft:illager_beast_spawn_egg",
+    "714": "minecraft:ravager_spawn_egg",
     "715": "minecraft:llama_spawn_egg",
     "716": "minecraft:magma_cube_spawn_egg",
     "717": "minecraft:mooshroom_spawn_egg",
@@ -11693,138 +11693,140 @@
     "735": "minecraft:spider_spawn_egg",
     "736": "minecraft:squid_spawn_egg",
     "737": "minecraft:stray_spawn_egg",
-    "738": "minecraft:tropical_fish_spawn_egg",
-    "739": "minecraft:turtle_spawn_egg",
-    "740": "minecraft:vex_spawn_egg",
-    "741": "minecraft:villager_spawn_egg",
-    "742": "minecraft:vindicator_spawn_egg",
-    "743": "minecraft:witch_spawn_egg",
-    "744": "minecraft:wither_skeleton_spawn_egg",
-    "745": "minecraft:wolf_spawn_egg",
-    "746": "minecraft:zombie_spawn_egg",
-    "747": "minecraft:zombie_horse_spawn_egg",
-    "748": "minecraft:zombie_pigman_spawn_egg",
-    "749": "minecraft:zombie_villager_spawn_egg",
-    "750": "minecraft:experience_bottle",
-    "751": "minecraft:fire_charge",
-    "752": "minecraft:writable_book",
-    "753": "minecraft:written_book",
-    "754": "minecraft:emerald",
-    "755": "minecraft:item_frame",
-    "756": "minecraft:flower_pot",
-    "757": "minecraft:carrot",
-    "758": "minecraft:potato",
-    "759": "minecraft:baked_potato",
-    "760": "minecraft:poisonous_potato",
-    "761": "minecraft:map",
-    "762": "minecraft:golden_carrot",
-    "763": "minecraft:skeleton_skull",
-    "764": "minecraft:wither_skeleton_skull",
-    "765": "minecraft:player_head",
-    "766": "minecraft:zombie_head",
-    "767": "minecraft:creeper_head",
-    "768": "minecraft:dragon_head",
-    "769": "minecraft:carrot_on_a_stick",
-    "770": "minecraft:nether_star",
-    "771": "minecraft:pumpkin_pie",
-    "772": "minecraft:firework_rocket",
-    "773": "minecraft:firework_star",
-    "774": "minecraft:enchanted_book",
-    "775": "minecraft:nether_brick",
-    "776": "minecraft:quartz",
-    "777": "minecraft:tnt_minecart",
-    "778": "minecraft:hopper_minecart",
-    "779": "minecraft:prismarine_shard",
-    "780": "minecraft:prismarine_crystals",
-    "781": "minecraft:rabbit",
-    "782": "minecraft:cooked_rabbit",
-    "783": "minecraft:rabbit_stew",
-    "784": "minecraft:rabbit_foot",
-    "785": "minecraft:rabbit_hide",
-    "786": "minecraft:armor_stand",
-    "787": "minecraft:iron_horse_armor",
-    "788": "minecraft:golden_horse_armor",
-    "789": "minecraft:diamond_horse_armor",
-    "790": "minecraft:lead",
-    "791": "minecraft:name_tag",
-    "792": "minecraft:command_block_minecart",
-    "793": "minecraft:mutton",
-    "794": "minecraft:cooked_mutton",
-    "795": "minecraft:white_banner",
-    "796": "minecraft:orange_banner",
-    "797": "minecraft:magenta_banner",
-    "798": "minecraft:light_blue_banner",
-    "799": "minecraft:yellow_banner",
-    "800": "minecraft:lime_banner",
-    "801": "minecraft:pink_banner",
-    "802": "minecraft:gray_banner",
-    "803": "minecraft:light_gray_banner",
-    "804": "minecraft:cyan_banner",
-    "805": "minecraft:purple_banner",
-    "806": "minecraft:blue_banner",
-    "807": "minecraft:brown_banner",
-    "808": "minecraft:green_banner",
-    "809": "minecraft:red_banner",
-    "810": "minecraft:black_banner",
-    "811": "minecraft:end_crystal",
-    "812": "minecraft:chorus_fruit",
-    "813": "minecraft:popped_chorus_fruit",
-    "814": "minecraft:beetroot",
-    "815": "minecraft:beetroot_seeds",
-    "816": "minecraft:beetroot_soup",
-    "817": "minecraft:dragon_breath",
-    "818": "minecraft:splash_potion",
-    "819": "minecraft:spectral_arrow",
-    "820": "minecraft:tipped_arrow",
-    "821": "minecraft:lingering_potion",
-    "822": "minecraft:shield",
-    "823": "minecraft:elytra",
-    "824": "minecraft:spruce_boat",
-    "825": "minecraft:birch_boat",
-    "826": "minecraft:jungle_boat",
-    "827": "minecraft:acacia_boat",
-    "828": "minecraft:dark_oak_boat",
-    "829": "minecraft:totem_of_undying",
-    "830": "minecraft:shulker_shell",
-    "831": "minecraft:iron_nugget",
-    "832": "minecraft:knowledge_book",
-    "833": "minecraft:debug_stick",
-    "834": "minecraft:music_disc_13",
-    "835": "minecraft:music_disc_cat",
-    "836": "minecraft:music_disc_blocks",
-    "837": "minecraft:music_disc_chirp",
-    "838": "minecraft:music_disc_far",
-    "839": "minecraft:music_disc_mall",
-    "840": "minecraft:music_disc_mellohi",
-    "841": "minecraft:music_disc_stal",
-    "842": "minecraft:music_disc_strad",
-    "843": "minecraft:music_disc_ward",
-    "844": "minecraft:music_disc_11",
-    "845": "minecraft:music_disc_wait",
-    "846": "minecraft:trident",
-    "847": "minecraft:phantom_membrane",
-    "848": "minecraft:nautilus_shell",
-    "849": "minecraft:heart_of_the_sea",
-    "850": "minecraft:crossbow",
-    "851": "minecraft:suspicious_stew",
-    "852": "minecraft:loom",
-    "853": "minecraft:flower_banner_pattern",
-    "854": "minecraft:creeper_banner_pattern",
-    "855": "minecraft:skull_banner_pattern",
-    "856": "minecraft:mojang_banner_pattern",
-    "857": "minecraft:barrel",
-    "858": "minecraft:smoker",
-    "859": "minecraft:blast_furnace",
-    "860": "minecraft:cartography_table",
-    "861": "minecraft:fletching_table",
-    "862": "minecraft:grindstone",
-    "863": "minecraft:lectern",
-    "864": "minecraft:smithing_table",
-    "865": "minecraft:stonecutter",
-    "866": "minecraft:bell",
-    "867": "minecraft:lantern",
-    "868": "minecraft:sweet_berries",
-    "869": "minecraft:campfire"
+    "738": "minecraft:trader_llama_spawn_egg",
+    "739": "minecraft:tropical_fish_spawn_egg",
+    "740": "minecraft:turtle_spawn_egg",
+    "741": "minecraft:vex_spawn_egg",
+    "742": "minecraft:villager_spawn_egg",
+    "743": "minecraft:vindicator_spawn_egg",
+    "744": "minecraft:wandering_trader_spawn_egg",
+    "745": "minecraft:witch_spawn_egg",
+    "746": "minecraft:wither_skeleton_spawn_egg",
+    "747": "minecraft:wolf_spawn_egg",
+    "748": "minecraft:zombie_spawn_egg",
+    "749": "minecraft:zombie_horse_spawn_egg",
+    "750": "minecraft:zombie_pigman_spawn_egg",
+    "751": "minecraft:zombie_villager_spawn_egg",
+    "752": "minecraft:experience_bottle",
+    "753": "minecraft:fire_charge",
+    "754": "minecraft:writable_book",
+    "755": "minecraft:written_book",
+    "756": "minecraft:emerald",
+    "757": "minecraft:item_frame",
+    "758": "minecraft:flower_pot",
+    "759": "minecraft:carrot",
+    "760": "minecraft:potato",
+    "761": "minecraft:baked_potato",
+    "762": "minecraft:poisonous_potato",
+    "763": "minecraft:map",
+    "764": "minecraft:golden_carrot",
+    "765": "minecraft:skeleton_skull",
+    "766": "minecraft:wither_skeleton_skull",
+    "767": "minecraft:player_head",
+    "768": "minecraft:zombie_head",
+    "769": "minecraft:creeper_head",
+    "770": "minecraft:dragon_head",
+    "771": "minecraft:carrot_on_a_stick",
+    "772": "minecraft:nether_star",
+    "773": "minecraft:pumpkin_pie",
+    "774": "minecraft:firework_rocket",
+    "775": "minecraft:firework_star",
+    "776": "minecraft:enchanted_book",
+    "777": "minecraft:nether_brick",
+    "778": "minecraft:quartz",
+    "779": "minecraft:tnt_minecart",
+    "780": "minecraft:hopper_minecart",
+    "781": "minecraft:prismarine_shard",
+    "782": "minecraft:prismarine_crystals",
+    "783": "minecraft:rabbit",
+    "784": "minecraft:cooked_rabbit",
+    "785": "minecraft:rabbit_stew",
+    "786": "minecraft:rabbit_foot",
+    "787": "minecraft:rabbit_hide",
+    "788": "minecraft:armor_stand",
+    "789": "minecraft:iron_horse_armor",
+    "790": "minecraft:golden_horse_armor",
+    "791": "minecraft:diamond_horse_armor",
+    "792": "minecraft:lead",
+    "793": "minecraft:name_tag",
+    "794": "minecraft:command_block_minecart",
+    "795": "minecraft:mutton",
+    "796": "minecraft:cooked_mutton",
+    "797": "minecraft:white_banner",
+    "798": "minecraft:orange_banner",
+    "799": "minecraft:magenta_banner",
+    "800": "minecraft:light_blue_banner",
+    "801": "minecraft:yellow_banner",
+    "802": "minecraft:lime_banner",
+    "803": "minecraft:pink_banner",
+    "804": "minecraft:gray_banner",
+    "805": "minecraft:light_gray_banner",
+    "806": "minecraft:cyan_banner",
+    "807": "minecraft:purple_banner",
+    "808": "minecraft:blue_banner",
+    "809": "minecraft:brown_banner",
+    "810": "minecraft:green_banner",
+    "811": "minecraft:red_banner",
+    "812": "minecraft:black_banner",
+    "813": "minecraft:end_crystal",
+    "814": "minecraft:chorus_fruit",
+    "815": "minecraft:popped_chorus_fruit",
+    "816": "minecraft:beetroot",
+    "817": "minecraft:beetroot_seeds",
+    "818": "minecraft:beetroot_soup",
+    "819": "minecraft:dragon_breath",
+    "820": "minecraft:splash_potion",
+    "821": "minecraft:spectral_arrow",
+    "822": "minecraft:tipped_arrow",
+    "823": "minecraft:lingering_potion",
+    "824": "minecraft:shield",
+    "825": "minecraft:elytra",
+    "826": "minecraft:spruce_boat",
+    "827": "minecraft:birch_boat",
+    "828": "minecraft:jungle_boat",
+    "829": "minecraft:acacia_boat",
+    "830": "minecraft:dark_oak_boat",
+    "831": "minecraft:totem_of_undying",
+    "832": "minecraft:shulker_shell",
+    "833": "minecraft:iron_nugget",
+    "834": "minecraft:knowledge_book",
+    "835": "minecraft:debug_stick",
+    "836": "minecraft:music_disc_13",
+    "837": "minecraft:music_disc_cat",
+    "838": "minecraft:music_disc_blocks",
+    "839": "minecraft:music_disc_chirp",
+    "840": "minecraft:music_disc_far",
+    "841": "minecraft:music_disc_mall",
+    "842": "minecraft:music_disc_mellohi",
+    "843": "minecraft:music_disc_stal",
+    "844": "minecraft:music_disc_strad",
+    "845": "minecraft:music_disc_ward",
+    "846": "minecraft:music_disc_11",
+    "847": "minecraft:music_disc_wait",
+    "848": "minecraft:trident",
+    "849": "minecraft:phantom_membrane",
+    "850": "minecraft:nautilus_shell",
+    "851": "minecraft:heart_of_the_sea",
+    "852": "minecraft:crossbow",
+    "853": "minecraft:suspicious_stew",
+    "854": "minecraft:loom",
+    "855": "minecraft:flower_banner_pattern",
+    "856": "minecraft:creeper_banner_pattern",
+    "857": "minecraft:skull_banner_pattern",
+    "858": "minecraft:mojang_banner_pattern",
+    "859": "minecraft:barrel",
+    "860": "minecraft:smoker",
+    "861": "minecraft:blast_furnace",
+    "862": "minecraft:cartography_table",
+    "863": "minecraft:fletching_table",
+    "864": "minecraft:grindstone",
+    "865": "minecraft:lectern",
+    "866": "minecraft:smithing_table",
+    "867": "minecraft:stonecutter",
+    "868": "minecraft:bell",
+    "869": "minecraft:lantern",
+    "870": "minecraft:sweet_berries",
+    "871": "minecraft:campfire"
   },
   "sounds": [
     "ambient.cave",
@@ -12129,13 +12131,13 @@
     "entity.husk.death",
     "entity.husk.hurt",
     "entity.husk.step",
-    "entity.illager_beast.ambient",
-    "entity.illager_beast.attack",
-    "entity.illager_beast.death",
-    "entity.illager_beast.hurt",
-    "entity.illager_beast.step",
-    "entity.illager_beast.stunned",
-    "entity.illager_beast.roar",
+    "entity.ravager.ambient",
+    "entity.ravager.attack",
+    "entity.ravager.death",
+    "entity.ravager.hurt",
+    "entity.ravager.step",
+    "entity.ravager.stunned",
+    "entity.ravager.roar",
     "entity.illusioner.ambient",
     "entity.illusioner.cast_spell",
     "entity.illusioner.death",
@@ -12163,6 +12165,11 @@
     "block.ladder.hit",
     "block.ladder.place",
     "block.ladder.step",
+    "block.lantern.break",
+    "block.lantern.fall",
+    "block.lantern.hit",
+    "block.lantern.place",
+    "block.lantern.step",
     "block.lava.ambient",
     "block.lava.extinguish",
     "block.lava.pop",
@@ -12501,6 +12508,12 @@
     "entity.vindicator.death",
     "entity.vindicator.hurt",
     "block.lily_pad.place",
+    "entity.wandering_trader.ambient",
+    "entity.wandering_trader.death",
+    "entity.wandering_trader.hurt",
+    "entity.wandering_trader.no",
+    "entity.wandering_trader.trade",
+    "entity.wandering_trader.yes",
     "block.water.ambient",
     "weather.rain",
     "weather.rain.above",
diff --git a/jar/pom.xml b/jar/pom.xml
index 75cd335a7..57f9225fe 100644
--- a/jar/pom.xml
+++ b/jar/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>viaversion-parent</artifactId>
         <groupId>us.myles</groupId>
-        <version>2.0.0-19w04b</version>
+        <version>2.0.0-19w05a</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <name>viaversion-jar</name>
diff --git a/pom.xml b/pom.xml
index d58548fce..b4fc34e64 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>us.myles</groupId>
     <artifactId>viaversion-parent</artifactId>
-    <version>2.0.0-19w04b</version>
+    <version>2.0.0-19w05a</version>
     <packaging>pom</packaging>
 
     <name>viaversion-parent</name>
diff --git a/sponge-legacy/pom.xml b/sponge-legacy/pom.xml
index 1a4ad4b88..f955ced2d 100644
--- a/sponge-legacy/pom.xml
+++ b/sponge-legacy/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>viaversion-parent</artifactId>
         <groupId>us.myles</groupId>
-        <version>2.0.0-19w04b</version>
+        <version>2.0.0-19w05a</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/sponge/pom.xml b/sponge/pom.xml
index fb58d2db4..999bf67fb 100644
--- a/sponge/pom.xml
+++ b/sponge/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>viaversion-parent</artifactId>
         <groupId>us.myles</groupId>
-        <version>2.0.0-19w04b</version>
+        <version>2.0.0-19w05a</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/velocity/pom.xml b/velocity/pom.xml
index 324137497..965199dfa 100644
--- a/velocity/pom.xml
+++ b/velocity/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>viaversion-parent</artifactId>
         <groupId>us.myles</groupId>
-        <version>2.0.0-19w04b</version>
+        <version>2.0.0-19w05a</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>