From f9d957a8278756d6d968063de25c91f069023a94 Mon Sep 17 00:00:00 2001 From: Gerrygames Date: Wed, 13 Mar 2019 17:53:17 +0100 Subject: [PATCH] 19w11a --- bukkit/pom.xml | 2 +- bungee/pom.xml | 2 +- common/pom.xml | 2 +- .../api/protocol/ProtocolVersion.java | 2 +- .../Protocol1_14To1_13_2.java | 42 ++ .../packets/InventoryPackets.java | 40 +- .../packets/PlayerPackets.java | 14 +- .../packets/WorldPackets.java | 45 +- .../assets/viaversion/data/mapping-1.14.json | 564 +++++++++--------- jar/pom.xml | 2 +- pom.xml | 2 +- sponge-legacy/pom.xml | 2 +- sponge/pom.xml | 2 +- velocity/pom.xml | 2 +- 14 files changed, 402 insertions(+), 321 deletions(-) diff --git a/bukkit/pom.xml b/bukkit/pom.xml index 032298504..cf5bdebc0 100644 --- a/bukkit/pom.xml +++ b/bukkit/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.0.0-19w09a + 2.0.0-19w11a 4.0.0 diff --git a/bungee/pom.xml b/bungee/pom.xml index 2e6f26bc9..5910940f9 100644 --- a/bungee/pom.xml +++ b/bungee/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.0.0-19w09a + 2.0.0-19w11a 4.0.0 diff --git a/common/pom.xml b/common/pom.xml index 8fd80c462..97eb910d1 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.0.0-19w09a + 2.0.0-19w11a 4.0.0 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 8b2b4b669..5f3960501 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(463, "1.14")); + register(v1_14 = new ProtocolVersion(464, "1.14")); register(unknown = new ProtocolVersion(-1, "UNKNOWN")); } diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_14to1_13_2/Protocol1_14To1_13_2.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_14to1_13_2/Protocol1_14To1_13_2.java index aff7dcd9f..9e2232001 100644 --- a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_14to1_13_2/Protocol1_14To1_13_2.java +++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_14to1_13_2/Protocol1_14To1_13_2.java @@ -176,6 +176,48 @@ public class Protocol1_14To1_13_2 extends Protocol { }); } }); + + registerIncoming(State.PLAY, -1, 0x02); //Unknown packet added in 19w11a + registerIncoming(State.PLAY, 0x02, 0x03); + registerIncoming(State.PLAY, 0x03, 0x04); + registerIncoming(State.PLAY, 0x04, 0x05); + registerIncoming(State.PLAY, 0x05, 0x06); + registerIncoming(State.PLAY, 0x06, 0x07); + registerIncoming(State.PLAY, 0x07, 0x08); + + registerIncoming(State.PLAY, 0x09, 0x0A); + registerIncoming(State.PLAY, 0x0A, 0x0B); + + registerIncoming(State.PLAY, 0x0C, 0x0D); + registerIncoming(State.PLAY, 0x0D, 0x0E); + registerIncoming(State.PLAY, -1, 0x0F); //Unknown packet added in 19w11a + registerIncoming(State.PLAY, 0x0E, 0x10); + registerIncoming(State.PLAY, 0x0F, 0x11); + registerIncoming(State.PLAY, 0x10, 0x12); + registerIncoming(State.PLAY, 0x11, 0x13); + registerIncoming(State.PLAY, 0x12, 0x14); + registerIncoming(State.PLAY, 0x13, 0x15); + registerIncoming(State.PLAY, 0x14, 0x16); + registerIncoming(State.PLAY, 0x15, 0x17); + registerIncoming(State.PLAY, 0x16, 0x18); + registerIncoming(State.PLAY, 0x17, 0x19); + + registerIncoming(State.PLAY, 0x19, 0x1B); + registerIncoming(State.PLAY, 0x1A, 0x1C); + + registerIncoming(State.PLAY, 0x1C, 0x1E); + registerIncoming(State.PLAY, 0x1D, 0x1F); + registerIncoming(State.PLAY, 0x1E, 0x20); + registerIncoming(State.PLAY, 0x1F, 0x21); + registerIncoming(State.PLAY, 0x20, 0x22); + registerIncoming(State.PLAY, 0x21, 0x23); + + registerIncoming(State.PLAY, 0x23, 0x25); + + registerIncoming(State.PLAY, 0x27, 0x29); + registerIncoming(State.PLAY, 0x28, 0x2A); + + registerIncoming(State.PLAY, 0x2A, 0x2C); } public static int getNewSoundId(int id) { diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_14to1_13_2/packets/InventoryPackets.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_14to1_13_2/packets/InventoryPackets.java index 4242f61af..0c606a6f0 100644 --- a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_14to1_13_2/packets/InventoryPackets.java +++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_14to1_13_2/packets/InventoryPackets.java @@ -29,6 +29,7 @@ public class InventoryPackets { Outgoing packets */ + // Open Inventory protocol.registerOutgoing(State.PLAY, 0x14, -1, new PacketRemapper() { @Override public void registerMap() { @@ -54,45 +55,38 @@ public class InventoryPackets { switch (type) { case "minecraft:container": case "minecraft:chest": - switch (slots) { - case 27: - typeId = 0; - break; - case 54: - typeId = 1; - break; - } + typeId = slots / 9 - 1; break; case "minecraft:crafting_table": - typeId = 7; + typeId = 11; break; case "minecraft:furnace": - typeId = 9; + typeId = 13; break; case "minecraft:dropper": case "minecraft:dispenser": - typeId = 2; - break; - case "minecraft:enchanting_table": - typeId = 8; - break; - case "minecraft:brewing_stand": typeId = 6; break; + case "minecraft:enchanting_table": + typeId = 12; + break; + case "minecraft:brewing_stand": + typeId = 10; + break; case "minecraft:villager": - typeId = 14; + typeId = 18; break; case "minecraft:beacon": - typeId = 4; + typeId = 8; break; case "minecraft:anvil": - typeId = 3; + typeId = 7; break; case "minecraft:hopper": - typeId = 11; + typeId = 15; break; case "minecraft:shulker_box": - typeId = 15; + typeId = 19; break; } @@ -261,7 +255,7 @@ public class InventoryPackets { */ // Click window packet - protocol.registerIncoming(State.PLAY, 0x08, 0x08, new PacketRemapper() { + protocol.registerIncoming(State.PLAY, 0x08, 0x09, new PacketRemapper() { @Override public void registerMap() { map(Type.UNSIGNED_BYTE); // 0 - Window ID @@ -281,7 +275,7 @@ public class InventoryPackets { }); // Creative Inventory Action - protocol.registerIncoming(State.PLAY, 0x24, 0x24, new PacketRemapper() { + protocol.registerIncoming(State.PLAY, 0x24, 0x26, new PacketRemapper() { @Override public void registerMap() { map(Type.SHORT); // 0 - Slot diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_14to1_13_2/packets/PlayerPackets.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_14to1_13_2/packets/PlayerPackets.java index 9989457b7..1410b88fa 100644 --- a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_14to1_13_2/packets/PlayerPackets.java +++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_14to1_13_2/packets/PlayerPackets.java @@ -35,7 +35,7 @@ public class PlayerPackets { }); // Edit Book - protocol.registerIncoming(State.PLAY, 0x0B, 0x0B, new PacketRemapper() { + protocol.registerIncoming(State.PLAY, 0x0B, 0x0C, new PacketRemapper() { @Override public void registerMap() { handler(new PacketHandler() { @@ -64,7 +64,7 @@ public class PlayerPackets { }); // Player Digging - protocol.registerIncoming(State.PLAY, 0x18, 0x18, new PacketRemapper() { + protocol.registerIncoming(State.PLAY, 0x18, 0x1A, new PacketRemapper() { @Override public void registerMap() { map(Type.VAR_INT); @@ -74,7 +74,7 @@ public class PlayerPackets { }); // Recipe Book Data - protocol.registerIncoming(State.PLAY, 0x1B, 0x1B, new PacketRemapper() { + protocol.registerIncoming(State.PLAY, 0x1B, 0x1D, new PacketRemapper() { @Override public void registerMap() { map(Type.VAR_INT); @@ -102,7 +102,7 @@ public class PlayerPackets { }); // Update Command Block - protocol.registerIncoming(State.PLAY, 0x22, 0x22, new PacketRemapper() { + protocol.registerIncoming(State.PLAY, 0x22, 0x24, new PacketRemapper() { @Override public void registerMap() { map(Type.POSITION1_14, Type.POSITION); @@ -110,7 +110,7 @@ public class PlayerPackets { }); // Update Structure Block - protocol.registerIncoming(State.PLAY, 0x25, 0x25, new PacketRemapper() { + protocol.registerIncoming(State.PLAY, 0x25, 0x27, new PacketRemapper() { @Override public void registerMap() { map(Type.POSITION1_14, Type.POSITION); @@ -118,7 +118,7 @@ public class PlayerPackets { }); // Update Sign - protocol.registerIncoming(State.PLAY, 0x26, 0x26, new PacketRemapper() { + protocol.registerIncoming(State.PLAY, 0x26, 0x28, new PacketRemapper() { @Override public void registerMap() { map(Type.POSITION1_14, Type.POSITION); @@ -126,7 +126,7 @@ public class PlayerPackets { }); // Player Block Placement - protocol.registerIncoming(State.PLAY, 0x29, 0x29, new PacketRemapper() { + protocol.registerIncoming(State.PLAY, 0x29, 0x2B, new PacketRemapper() { @Override public void registerMap() { handler(new PacketHandler() { diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_14to1_13_2/packets/WorldPackets.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_14to1_13_2/packets/WorldPackets.java index 0ee82b5dd..2c45a5c51 100644 --- a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_14to1_13_2/packets/WorldPackets.java +++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_14to1_13_2/packets/WorldPackets.java @@ -28,7 +28,7 @@ public class WorldPackets { public static void register(Protocol protocol) { - // Block break animation + // Block Break Animation protocol.registerOutgoing(State.PLAY, 0x08, 0x08, new PacketRemapper() { @Override public void registerMap() { @@ -38,7 +38,7 @@ public class WorldPackets { } }); - // Update block entity + // Update Block Entity protocol.registerOutgoing(State.PLAY, 0x09, 0x09, new PacketRemapper() { @Override public void registerMap() { @@ -80,6 +80,20 @@ public class WorldPackets { } }); + // Server Difficulty + protocol.registerOutgoing(State.PLAY, 0x0D, 0x0D, new PacketRemapper() { + @Override + public void registerMap() { + map(Type.UNSIGNED_BYTE); + create(new ValueCreator() { + @Override + public void write(PacketWrapper wrapper) throws Exception { + wrapper.write(Type.BOOLEAN, false); // Added in 19w11a. Maybe https://bugs.mojang.com/browse/MC-44471 ? + } + }); + } + }); + // Multi Block Change protocol.registerOutgoing(State.PLAY, 0xF, 0xF, new PacketRemapper() { @Override @@ -100,7 +114,7 @@ public class WorldPackets { } }); - //Chunk + // Chunk protocol.registerOutgoing(State.PLAY, 0x22, 0x22, new PacketRemapper() { @Override public void registerMap() { @@ -181,7 +195,7 @@ public class WorldPackets { } }); - // Effect packet + // Effect protocol.registerOutgoing(State.PLAY, 0x23, 0x23, new PacketRemapper() { @Override public void registerMap() { @@ -203,7 +217,7 @@ public class WorldPackets { } }); - //spawn particle + // Spawn Particle protocol.registerOutgoing(State.PLAY, 0x24, 0x24, new PacketRemapper() { @Override public void registerMap() { @@ -253,7 +267,7 @@ public class WorldPackets { } }); - //join game + // Join Game protocol.registerOutgoing(State.PLAY, 0x25, 0x25, new PacketRemapper() { @Override public void registerMap() { @@ -276,10 +290,17 @@ public class WorldPackets { wrapper.user().get(EntityTracker.class).addEntity(entityId, wrapper.user().get(ProtocolInfo.class).getUuid(), entType); } }); + + handler(new PacketHandler() { + @Override + public void handle(PacketWrapper wrapper) throws Exception { + wrapper.read(Type.UNSIGNED_BYTE); // 19w11a removed difficulty from join game + } + }); } }); - //Map Data + // Map Data protocol.registerOutgoing(State.PLAY, 0x26, 0x26, new PacketRemapper() { @Override public void registerMap() { @@ -295,7 +316,7 @@ public class WorldPackets { } }); - //respawn + // Respawn protocol.registerOutgoing(State.PLAY, 0x38, 0x38, new PacketRemapper() { @Override public void registerMap() { @@ -308,10 +329,16 @@ public class WorldPackets { clientWorld.setEnvironment(dimensionId); } }); + handler(new PacketHandler() { + @Override + public void handle(PacketWrapper wrapper) throws Exception { + wrapper.read(Type.UNSIGNED_BYTE); // 19w11 remobed difficulty from respawn + } + }); } }); - // Spawn position + // Spawn Position protocol.registerOutgoing(State.PLAY, 0x49, 0x49, new PacketRemapper() { @Override public void registerMap() { 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 80d69019b..edb064e07 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 @@ -11506,264 +11506,264 @@ "242": "minecraft:beacon", "243": "minecraft:cobblestone_wall", "244": "minecraft:mossy_cobblestone_wall", - "245": "minecraft:oak_button", - "246": "minecraft:spruce_button", - "247": "minecraft:birch_button", - "248": "minecraft:jungle_button", - "249": "minecraft:acacia_button", - "250": "minecraft:dark_oak_button", - "251": "minecraft:anvil", - "252": "minecraft:chipped_anvil", - "253": "minecraft:damaged_anvil", - "254": "minecraft:trapped_chest", - "255": "minecraft:light_weighted_pressure_plate", - "256": "minecraft:heavy_weighted_pressure_plate", - "257": "minecraft:daylight_detector", - "258": "minecraft:redstone_block", - "259": "minecraft:nether_quartz_ore", - "260": "minecraft:hopper", - "261": "minecraft:chiseled_quartz_block", - "262": "minecraft:quartz_block", - "263": "minecraft:quartz_pillar", - "264": "minecraft:quartz_stairs", - "265": "minecraft:activator_rail", - "266": "minecraft:dropper", - "267": "minecraft:white_terracotta", - "268": "minecraft:orange_terracotta", - "269": "minecraft:magenta_terracotta", - "270": "minecraft:light_blue_terracotta", - "271": "minecraft:yellow_terracotta", - "272": "minecraft:lime_terracotta", - "273": "minecraft:pink_terracotta", - "274": "minecraft:gray_terracotta", - "275": "minecraft:light_gray_terracotta", - "276": "minecraft:cyan_terracotta", - "277": "minecraft:purple_terracotta", - "278": "minecraft:blue_terracotta", - "279": "minecraft:brown_terracotta", - "280": "minecraft:green_terracotta", - "281": "minecraft:red_terracotta", - "282": "minecraft:black_terracotta", - "283": "minecraft:barrier", - "284": "minecraft:iron_trapdoor", - "285": "minecraft:hay_block", - "286": "minecraft:white_carpet", - "287": "minecraft:orange_carpet", - "288": "minecraft:magenta_carpet", - "289": "minecraft:light_blue_carpet", - "290": "minecraft:yellow_carpet", - "291": "minecraft:lime_carpet", - "292": "minecraft:pink_carpet", - "293": "minecraft:gray_carpet", - "294": "minecraft:light_gray_carpet", - "295": "minecraft:cyan_carpet", - "296": "minecraft:purple_carpet", - "297": "minecraft:blue_carpet", - "298": "minecraft:brown_carpet", - "299": "minecraft:green_carpet", - "300": "minecraft:red_carpet", - "301": "minecraft:black_carpet", - "302": "minecraft:terracotta", - "303": "minecraft:coal_block", - "304": "minecraft:packed_ice", - "305": "minecraft:acacia_stairs", - "306": "minecraft:dark_oak_stairs", - "307": "minecraft:slime_block", - "308": "minecraft:grass_path", - "309": "minecraft:sunflower", - "310": "minecraft:lilac", - "311": "minecraft:rose_bush", - "312": "minecraft:peony", - "313": "minecraft:tall_grass", - "314": "minecraft:large_fern", - "315": "minecraft:white_stained_glass", - "316": "minecraft:orange_stained_glass", - "317": "minecraft:magenta_stained_glass", - "318": "minecraft:light_blue_stained_glass", - "319": "minecraft:yellow_stained_glass", - "320": "minecraft:lime_stained_glass", - "321": "minecraft:pink_stained_glass", - "322": "minecraft:gray_stained_glass", - "323": "minecraft:light_gray_stained_glass", - "324": "minecraft:cyan_stained_glass", - "325": "minecraft:purple_stained_glass", - "326": "minecraft:blue_stained_glass", - "327": "minecraft:brown_stained_glass", - "328": "minecraft:green_stained_glass", - "329": "minecraft:red_stained_glass", - "330": "minecraft:black_stained_glass", - "331": "minecraft:white_stained_glass_pane", - "332": "minecraft:orange_stained_glass_pane", - "333": "minecraft:magenta_stained_glass_pane", - "334": "minecraft:light_blue_stained_glass_pane", - "335": "minecraft:yellow_stained_glass_pane", - "336": "minecraft:lime_stained_glass_pane", - "337": "minecraft:pink_stained_glass_pane", - "338": "minecraft:gray_stained_glass_pane", - "339": "minecraft:light_gray_stained_glass_pane", - "340": "minecraft:cyan_stained_glass_pane", - "341": "minecraft:purple_stained_glass_pane", - "342": "minecraft:blue_stained_glass_pane", - "343": "minecraft:brown_stained_glass_pane", - "344": "minecraft:green_stained_glass_pane", - "345": "minecraft:red_stained_glass_pane", - "346": "minecraft:black_stained_glass_pane", - "347": "minecraft:prismarine", - "348": "minecraft:prismarine_bricks", - "349": "minecraft:dark_prismarine", - "350": "minecraft:prismarine_stairs", - "351": "minecraft:prismarine_brick_stairs", - "352": "minecraft:dark_prismarine_stairs", - "353": "minecraft:sea_lantern", - "354": "minecraft:red_sandstone", - "355": "minecraft:chiseled_red_sandstone", - "356": "minecraft:cut_red_sandstone", - "357": "minecraft:red_sandstone_stairs", - "358": "minecraft:repeating_command_block", - "359": "minecraft:chain_command_block", - "360": "minecraft:magma_block", - "361": "minecraft:nether_wart_block", - "362": "minecraft:red_nether_bricks", - "363": "minecraft:bone_block", - "364": "minecraft:structure_void", - "365": "minecraft:observer", - "366": "minecraft:shulker_box", - "367": "minecraft:white_shulker_box", - "368": "minecraft:orange_shulker_box", - "369": "minecraft:magenta_shulker_box", - "370": "minecraft:light_blue_shulker_box", - "371": "minecraft:yellow_shulker_box", - "372": "minecraft:lime_shulker_box", - "373": "minecraft:pink_shulker_box", - "374": "minecraft:gray_shulker_box", - "375": "minecraft:light_gray_shulker_box", - "376": "minecraft:cyan_shulker_box", - "377": "minecraft:purple_shulker_box", - "378": "minecraft:blue_shulker_box", - "379": "minecraft:brown_shulker_box", - "380": "minecraft:green_shulker_box", - "381": "minecraft:red_shulker_box", - "382": "minecraft:black_shulker_box", - "383": "minecraft:white_glazed_terracotta", - "384": "minecraft:orange_glazed_terracotta", - "385": "minecraft:magenta_glazed_terracotta", - "386": "minecraft:light_blue_glazed_terracotta", - "387": "minecraft:yellow_glazed_terracotta", - "388": "minecraft:lime_glazed_terracotta", - "389": "minecraft:pink_glazed_terracotta", - "390": "minecraft:gray_glazed_terracotta", - "391": "minecraft:light_gray_glazed_terracotta", - "392": "minecraft:cyan_glazed_terracotta", - "393": "minecraft:purple_glazed_terracotta", - "394": "minecraft:blue_glazed_terracotta", - "395": "minecraft:brown_glazed_terracotta", - "396": "minecraft:green_glazed_terracotta", - "397": "minecraft:red_glazed_terracotta", - "398": "minecraft:black_glazed_terracotta", - "399": "minecraft:white_concrete", - "400": "minecraft:orange_concrete", - "401": "minecraft:magenta_concrete", - "402": "minecraft:light_blue_concrete", - "403": "minecraft:yellow_concrete", - "404": "minecraft:lime_concrete", - "405": "minecraft:pink_concrete", - "406": "minecraft:gray_concrete", - "407": "minecraft:light_gray_concrete", - "408": "minecraft:cyan_concrete", - "409": "minecraft:purple_concrete", - "410": "minecraft:blue_concrete", - "411": "minecraft:brown_concrete", - "412": "minecraft:green_concrete", - "413": "minecraft:red_concrete", - "414": "minecraft:black_concrete", - "415": "minecraft:white_concrete_powder", - "416": "minecraft:orange_concrete_powder", - "417": "minecraft:magenta_concrete_powder", - "418": "minecraft:light_blue_concrete_powder", - "419": "minecraft:yellow_concrete_powder", - "420": "minecraft:lime_concrete_powder", - "421": "minecraft:pink_concrete_powder", - "422": "minecraft:gray_concrete_powder", - "423": "minecraft:light_gray_concrete_powder", - "424": "minecraft:cyan_concrete_powder", - "425": "minecraft:purple_concrete_powder", - "426": "minecraft:blue_concrete_powder", - "427": "minecraft:brown_concrete_powder", - "428": "minecraft:green_concrete_powder", - "429": "minecraft:red_concrete_powder", - "430": "minecraft:black_concrete_powder", - "431": "minecraft:turtle_egg", - "432": "minecraft:dead_tube_coral_block", - "433": "minecraft:dead_brain_coral_block", - "434": "minecraft:dead_bubble_coral_block", - "435": "minecraft:dead_fire_coral_block", - "436": "minecraft:dead_horn_coral_block", - "437": "minecraft:tube_coral_block", - "438": "minecraft:brain_coral_block", - "439": "minecraft:bubble_coral_block", - "440": "minecraft:fire_coral_block", - "441": "minecraft:horn_coral_block", - "442": "minecraft:tube_coral", - "443": "minecraft:brain_coral", - "444": "minecraft:bubble_coral", - "445": "minecraft:fire_coral", - "446": "minecraft:horn_coral", - "447": "minecraft:dead_brain_coral", - "448": "minecraft:dead_bubble_coral", - "449": "minecraft:dead_fire_coral", - "450": "minecraft:dead_horn_coral", - "451": "minecraft:dead_tube_coral", - "452": "minecraft:tube_coral_fan", - "453": "minecraft:brain_coral_fan", - "454": "minecraft:bubble_coral_fan", - "455": "minecraft:fire_coral_fan", - "456": "minecraft:horn_coral_fan", - "457": "minecraft:dead_tube_coral_fan", - "458": "minecraft:dead_brain_coral_fan", - "459": "minecraft:dead_bubble_coral_fan", - "460": "minecraft:dead_fire_coral_fan", - "461": "minecraft:dead_horn_coral_fan", - "462": "minecraft:blue_ice", - "463": "minecraft:conduit", - "464": "minecraft:polished_granite_stairs", - "465": "minecraft:smooth_red_sandstone_stairs", - "466": "minecraft:mossy_stone_brick_stairs", - "467": "minecraft:polished_diorite_stairs", - "468": "minecraft:mossy_cobblestone_stairs", - "469": "minecraft:end_stone_brick_stairs", - "470": "minecraft:stone_stairs", - "471": "minecraft:smooth_sandstone_stairs", - "472": "minecraft:smooth_quartz_stairs", - "473": "minecraft:granite_stairs", - "474": "minecraft:andesite_stairs", - "475": "minecraft:red_nether_brick_stairs", - "476": "minecraft:polished_andesite_stairs", - "477": "minecraft:diorite_stairs", - "478": "minecraft:polished_granite_slab", - "479": "minecraft:smooth_red_sandstone_slab", - "480": "minecraft:mossy_stone_brick_slab", - "481": "minecraft:polished_diorite_slab", - "482": "minecraft:mossy_cobblestone_slab", - "483": "minecraft:end_stone_brick_slab", - "484": "minecraft:smooth_sandstone_slab", - "485": "minecraft:smooth_quartz_slab", - "486": "minecraft:granite_slab", - "487": "minecraft:andesite_slab", - "488": "minecraft:red_nether_brick_slab", - "489": "minecraft:polished_andesite_slab", - "490": "minecraft:diorite_slab", - "491": "minecraft:brick_wall", - "492": "minecraft:prismarine_wall", - "493": "minecraft:red_sandstone_wall", - "494": "minecraft:mossy_stone_brick_wall", - "495": "minecraft:granite_wall", - "496": "minecraft:stone_brick_wall", - "497": "minecraft:nether_brick_wall", - "498": "minecraft:andesite_wall", - "499": "minecraft:red_nether_brick_wall", - "500": "minecraft:sandstone_wall", - "501": "minecraft:end_stone_brick_wall", - "502": "minecraft:diorite_wall", + "245": "minecraft:brick_wall", + "246": "minecraft:prismarine_wall", + "247": "minecraft:red_sandstone_wall", + "248": "minecraft:mossy_stone_brick_wall", + "249": "minecraft:granite_wall", + "250": "minecraft:stone_brick_wall", + "251": "minecraft:nether_brick_wall", + "252": "minecraft:andesite_wall", + "253": "minecraft:red_nether_brick_wall", + "254": "minecraft:sandstone_wall", + "255": "minecraft:end_stone_brick_wall", + "256": "minecraft:diorite_wall", + "257": "minecraft:oak_button", + "258": "minecraft:spruce_button", + "259": "minecraft:birch_button", + "260": "minecraft:jungle_button", + "261": "minecraft:acacia_button", + "262": "minecraft:dark_oak_button", + "263": "minecraft:anvil", + "264": "minecraft:chipped_anvil", + "265": "minecraft:damaged_anvil", + "266": "minecraft:trapped_chest", + "267": "minecraft:light_weighted_pressure_plate", + "268": "minecraft:heavy_weighted_pressure_plate", + "269": "minecraft:daylight_detector", + "270": "minecraft:redstone_block", + "271": "minecraft:nether_quartz_ore", + "272": "minecraft:hopper", + "273": "minecraft:chiseled_quartz_block", + "274": "minecraft:quartz_block", + "275": "minecraft:quartz_pillar", + "276": "minecraft:quartz_stairs", + "277": "minecraft:activator_rail", + "278": "minecraft:dropper", + "279": "minecraft:white_terracotta", + "280": "minecraft:orange_terracotta", + "281": "minecraft:magenta_terracotta", + "282": "minecraft:light_blue_terracotta", + "283": "minecraft:yellow_terracotta", + "284": "minecraft:lime_terracotta", + "285": "minecraft:pink_terracotta", + "286": "minecraft:gray_terracotta", + "287": "minecraft:light_gray_terracotta", + "288": "minecraft:cyan_terracotta", + "289": "minecraft:purple_terracotta", + "290": "minecraft:blue_terracotta", + "291": "minecraft:brown_terracotta", + "292": "minecraft:green_terracotta", + "293": "minecraft:red_terracotta", + "294": "minecraft:black_terracotta", + "295": "minecraft:barrier", + "296": "minecraft:iron_trapdoor", + "297": "minecraft:hay_block", + "298": "minecraft:white_carpet", + "299": "minecraft:orange_carpet", + "300": "minecraft:magenta_carpet", + "301": "minecraft:light_blue_carpet", + "302": "minecraft:yellow_carpet", + "303": "minecraft:lime_carpet", + "304": "minecraft:pink_carpet", + "305": "minecraft:gray_carpet", + "306": "minecraft:light_gray_carpet", + "307": "minecraft:cyan_carpet", + "308": "minecraft:purple_carpet", + "309": "minecraft:blue_carpet", + "310": "minecraft:brown_carpet", + "311": "minecraft:green_carpet", + "312": "minecraft:red_carpet", + "313": "minecraft:black_carpet", + "314": "minecraft:terracotta", + "315": "minecraft:coal_block", + "316": "minecraft:packed_ice", + "317": "minecraft:acacia_stairs", + "318": "minecraft:dark_oak_stairs", + "319": "minecraft:slime_block", + "320": "minecraft:grass_path", + "321": "minecraft:sunflower", + "322": "minecraft:lilac", + "323": "minecraft:rose_bush", + "324": "minecraft:peony", + "325": "minecraft:tall_grass", + "326": "minecraft:large_fern", + "327": "minecraft:white_stained_glass", + "328": "minecraft:orange_stained_glass", + "329": "minecraft:magenta_stained_glass", + "330": "minecraft:light_blue_stained_glass", + "331": "minecraft:yellow_stained_glass", + "332": "minecraft:lime_stained_glass", + "333": "minecraft:pink_stained_glass", + "334": "minecraft:gray_stained_glass", + "335": "minecraft:light_gray_stained_glass", + "336": "minecraft:cyan_stained_glass", + "337": "minecraft:purple_stained_glass", + "338": "minecraft:blue_stained_glass", + "339": "minecraft:brown_stained_glass", + "340": "minecraft:green_stained_glass", + "341": "minecraft:red_stained_glass", + "342": "minecraft:black_stained_glass", + "343": "minecraft:white_stained_glass_pane", + "344": "minecraft:orange_stained_glass_pane", + "345": "minecraft:magenta_stained_glass_pane", + "346": "minecraft:light_blue_stained_glass_pane", + "347": "minecraft:yellow_stained_glass_pane", + "348": "minecraft:lime_stained_glass_pane", + "349": "minecraft:pink_stained_glass_pane", + "350": "minecraft:gray_stained_glass_pane", + "351": "minecraft:light_gray_stained_glass_pane", + "352": "minecraft:cyan_stained_glass_pane", + "353": "minecraft:purple_stained_glass_pane", + "354": "minecraft:blue_stained_glass_pane", + "355": "minecraft:brown_stained_glass_pane", + "356": "minecraft:green_stained_glass_pane", + "357": "minecraft:red_stained_glass_pane", + "358": "minecraft:black_stained_glass_pane", + "359": "minecraft:prismarine", + "360": "minecraft:prismarine_bricks", + "361": "minecraft:dark_prismarine", + "362": "minecraft:prismarine_stairs", + "363": "minecraft:prismarine_brick_stairs", + "364": "minecraft:dark_prismarine_stairs", + "365": "minecraft:sea_lantern", + "366": "minecraft:red_sandstone", + "367": "minecraft:chiseled_red_sandstone", + "368": "minecraft:cut_red_sandstone", + "369": "minecraft:red_sandstone_stairs", + "370": "minecraft:repeating_command_block", + "371": "minecraft:chain_command_block", + "372": "minecraft:magma_block", + "373": "minecraft:nether_wart_block", + "374": "minecraft:red_nether_bricks", + "375": "minecraft:bone_block", + "376": "minecraft:structure_void", + "377": "minecraft:observer", + "378": "minecraft:shulker_box", + "379": "minecraft:white_shulker_box", + "380": "minecraft:orange_shulker_box", + "381": "minecraft:magenta_shulker_box", + "382": "minecraft:light_blue_shulker_box", + "383": "minecraft:yellow_shulker_box", + "384": "minecraft:lime_shulker_box", + "385": "minecraft:pink_shulker_box", + "386": "minecraft:gray_shulker_box", + "387": "minecraft:light_gray_shulker_box", + "388": "minecraft:cyan_shulker_box", + "389": "minecraft:purple_shulker_box", + "390": "minecraft:blue_shulker_box", + "391": "minecraft:brown_shulker_box", + "392": "minecraft:green_shulker_box", + "393": "minecraft:red_shulker_box", + "394": "minecraft:black_shulker_box", + "395": "minecraft:white_glazed_terracotta", + "396": "minecraft:orange_glazed_terracotta", + "397": "minecraft:magenta_glazed_terracotta", + "398": "minecraft:light_blue_glazed_terracotta", + "399": "minecraft:yellow_glazed_terracotta", + "400": "minecraft:lime_glazed_terracotta", + "401": "minecraft:pink_glazed_terracotta", + "402": "minecraft:gray_glazed_terracotta", + "403": "minecraft:light_gray_glazed_terracotta", + "404": "minecraft:cyan_glazed_terracotta", + "405": "minecraft:purple_glazed_terracotta", + "406": "minecraft:blue_glazed_terracotta", + "407": "minecraft:brown_glazed_terracotta", + "408": "minecraft:green_glazed_terracotta", + "409": "minecraft:red_glazed_terracotta", + "410": "minecraft:black_glazed_terracotta", + "411": "minecraft:white_concrete", + "412": "minecraft:orange_concrete", + "413": "minecraft:magenta_concrete", + "414": "minecraft:light_blue_concrete", + "415": "minecraft:yellow_concrete", + "416": "minecraft:lime_concrete", + "417": "minecraft:pink_concrete", + "418": "minecraft:gray_concrete", + "419": "minecraft:light_gray_concrete", + "420": "minecraft:cyan_concrete", + "421": "minecraft:purple_concrete", + "422": "minecraft:blue_concrete", + "423": "minecraft:brown_concrete", + "424": "minecraft:green_concrete", + "425": "minecraft:red_concrete", + "426": "minecraft:black_concrete", + "427": "minecraft:white_concrete_powder", + "428": "minecraft:orange_concrete_powder", + "429": "minecraft:magenta_concrete_powder", + "430": "minecraft:light_blue_concrete_powder", + "431": "minecraft:yellow_concrete_powder", + "432": "minecraft:lime_concrete_powder", + "433": "minecraft:pink_concrete_powder", + "434": "minecraft:gray_concrete_powder", + "435": "minecraft:light_gray_concrete_powder", + "436": "minecraft:cyan_concrete_powder", + "437": "minecraft:purple_concrete_powder", + "438": "minecraft:blue_concrete_powder", + "439": "minecraft:brown_concrete_powder", + "440": "minecraft:green_concrete_powder", + "441": "minecraft:red_concrete_powder", + "442": "minecraft:black_concrete_powder", + "443": "minecraft:turtle_egg", + "444": "minecraft:dead_tube_coral_block", + "445": "minecraft:dead_brain_coral_block", + "446": "minecraft:dead_bubble_coral_block", + "447": "minecraft:dead_fire_coral_block", + "448": "minecraft:dead_horn_coral_block", + "449": "minecraft:tube_coral_block", + "450": "minecraft:brain_coral_block", + "451": "minecraft:bubble_coral_block", + "452": "minecraft:fire_coral_block", + "453": "minecraft:horn_coral_block", + "454": "minecraft:tube_coral", + "455": "minecraft:brain_coral", + "456": "minecraft:bubble_coral", + "457": "minecraft:fire_coral", + "458": "minecraft:horn_coral", + "459": "minecraft:dead_brain_coral", + "460": "minecraft:dead_bubble_coral", + "461": "minecraft:dead_fire_coral", + "462": "minecraft:dead_horn_coral", + "463": "minecraft:dead_tube_coral", + "464": "minecraft:tube_coral_fan", + "465": "minecraft:brain_coral_fan", + "466": "minecraft:bubble_coral_fan", + "467": "minecraft:fire_coral_fan", + "468": "minecraft:horn_coral_fan", + "469": "minecraft:dead_tube_coral_fan", + "470": "minecraft:dead_brain_coral_fan", + "471": "minecraft:dead_bubble_coral_fan", + "472": "minecraft:dead_fire_coral_fan", + "473": "minecraft:dead_horn_coral_fan", + "474": "minecraft:blue_ice", + "475": "minecraft:conduit", + "476": "minecraft:polished_granite_stairs", + "477": "minecraft:smooth_red_sandstone_stairs", + "478": "minecraft:mossy_stone_brick_stairs", + "479": "minecraft:polished_diorite_stairs", + "480": "minecraft:mossy_cobblestone_stairs", + "481": "minecraft:end_stone_brick_stairs", + "482": "minecraft:stone_stairs", + "483": "minecraft:smooth_sandstone_stairs", + "484": "minecraft:smooth_quartz_stairs", + "485": "minecraft:granite_stairs", + "486": "minecraft:andesite_stairs", + "487": "minecraft:red_nether_brick_stairs", + "488": "minecraft:polished_andesite_stairs", + "489": "minecraft:diorite_stairs", + "490": "minecraft:polished_granite_slab", + "491": "minecraft:smooth_red_sandstone_slab", + "492": "minecraft:mossy_stone_brick_slab", + "493": "minecraft:polished_diorite_slab", + "494": "minecraft:mossy_cobblestone_slab", + "495": "minecraft:end_stone_brick_slab", + "496": "minecraft:smooth_sandstone_slab", + "497": "minecraft:smooth_quartz_slab", + "498": "minecraft:granite_slab", + "499": "minecraft:andesite_slab", + "500": "minecraft:red_nether_brick_slab", + "501": "minecraft:polished_andesite_slab", + "502": "minecraft:diorite_slab", "503": "minecraft:scaffolding", "504": "minecraft:iron_door", "505": "minecraft:oak_door", @@ -11851,8 +11851,8 @@ "587": "minecraft:oak_sign", "588": "minecraft:spruce_sign", "589": "minecraft:birch_sign", - "590": "minecraft:acacia_sign", - "591": "minecraft:jungle_sign", + "590": "minecraft:jungle_sign", + "591": "minecraft:acacia_sign", "592": "minecraft:dark_oak_sign", "593": "minecraft:bucket", "594": "minecraft:water_bucket", @@ -12122,19 +12122,20 @@ "858": "minecraft:creeper_banner_pattern", "859": "minecraft:skull_banner_pattern", "860": "minecraft:mojang_banner_pattern", - "861": "minecraft:barrel", - "862": "minecraft:smoker", - "863": "minecraft:blast_furnace", - "864": "minecraft:cartography_table", - "865": "minecraft:fletching_table", - "866": "minecraft:grindstone", - "867": "minecraft:lectern", - "868": "minecraft:smithing_table", - "869": "minecraft:stonecutter", - "870": "minecraft:bell", - "871": "minecraft:lantern", - "872": "minecraft:sweet_berries", - "873": "minecraft:campfire" + "861": "minecraft:globe_banner_pattern", + "862": "minecraft:barrel", + "863": "minecraft:smoker", + "864": "minecraft:blast_furnace", + "865": "minecraft:cartography_table", + "866": "minecraft:fletching_table", + "867": "minecraft:grindstone", + "868": "minecraft:lectern", + "869": "minecraft:smithing_table", + "870": "minecraft:stonecutter", + "871": "minecraft:bell", + "872": "minecraft:lantern", + "873": "minecraft:sweet_berries", + "874": "minecraft:campfire" }, "sounds": [ "ambient.cave", @@ -12584,11 +12585,15 @@ "entity.parrot.imitate.endermite", "entity.parrot.imitate.evoker", "entity.parrot.imitate.ghast", + "entity.parrot.imitate.guardian", "entity.parrot.imitate.husk", "entity.parrot.imitate.illusioner", "entity.parrot.imitate.magma_cube", + "entity.parrot.imitate.panda", "entity.parrot.imitate.phantom", + "entity.parrot.imitate.pillager", "entity.parrot.imitate.polar_bear", + "entity.parrot.imitate.ravager", "entity.parrot.imitate.shulker", "entity.parrot.imitate.silverfish", "entity.parrot.imitate.skeleton", @@ -12831,6 +12836,19 @@ "entity.villager.no", "entity.villager.trade", "entity.villager.yes", + "entity.villager.work_armorer", + "entity.villager.work_butcher", + "entity.villager.work_cartographer", + "entity.villager.work_cleric", + "entity.villager.work_farmer", + "entity.villager.work_fisherman", + "entity.villager.work_fletcher", + "entity.villager.work_leatherworker", + "entity.villager.work_librarian", + "entity.villager.work_mason", + "entity.villager.work_shepherd", + "entity.villager.work_toolsmith", + "entity.villager.work_weaponsmith", "entity.vindicator.ambient", "entity.vindicator.death", "entity.vindicator.hurt", diff --git a/jar/pom.xml b/jar/pom.xml index b769964f8..99fd825c3 100644 --- a/jar/pom.xml +++ b/jar/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.0.0-19w09a + 2.0.0-19w11a 4.0.0 viaversion-jar diff --git a/pom.xml b/pom.xml index 6917d394c..7825fbbc5 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ us.myles viaversion-parent - 2.0.0-19w09a + 2.0.0-19w11a pom viaversion-parent diff --git a/sponge-legacy/pom.xml b/sponge-legacy/pom.xml index 67c8b8ae5..03163485a 100644 --- a/sponge-legacy/pom.xml +++ b/sponge-legacy/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.0.0-19w09a + 2.0.0-19w11a 4.0.0 diff --git a/sponge/pom.xml b/sponge/pom.xml index 1ae5de61e..a0b1446b5 100644 --- a/sponge/pom.xml +++ b/sponge/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.0.0-19w09a + 2.0.0-19w11a 4.0.0 diff --git a/velocity/pom.xml b/velocity/pom.xml index 48de25522..0a7619685 100644 --- a/velocity/pom.xml +++ b/velocity/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.0.0-19w09a + 2.0.0-19w11a 4.0.0