From 7102214c9e68158dcde89fc703c83f7bcae3f030 Mon Sep 17 00:00:00 2001 From: Gerrygames Date: Wed, 16 Jan 2019 18:44:37 +0100 Subject: [PATCH] 19w03a --- bukkit/pom.xml | 2 +- bungee/pom.xml | 2 +- common/pom.xml | 2 +- .../api/protocol/ProtocolVersion.java | 2 +- .../packets/InventoryPackets.java | 2 +- .../packets/PlayerPackets.java | 21 +- .../assets/viaversion/data/mapping-1.14.json | 809 ++++++++++-------- jar/pom.xml | 2 +- pom.xml | 2 +- sponge-legacy/pom.xml | 2 +- sponge/pom.xml | 2 +- velocity/pom.xml | 2 +- 12 files changed, 460 insertions(+), 390 deletions(-) diff --git a/bukkit/pom.xml b/bukkit/pom.xml index 76743ee05..ab0639895 100644 --- a/bukkit/pom.xml +++ b/bukkit/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.0.0-19w02a + 2.0.0-19w03a 4.0.0 diff --git a/bungee/pom.xml b/bungee/pom.xml index 87ad3a815..0fc78ed77 100644 --- a/bungee/pom.xml +++ b/bungee/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.0.0-19w02a + 2.0.0-19w03a 4.0.0 diff --git a/common/pom.xml b/common/pom.xml index 2e80edc74..2f53b80be 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.0.0-19w02a + 2.0.0-19w03a 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 2e28329d8..13751fcb4 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(452, "1.14")); + register(v1_14 = new ProtocolVersion(453, "1.14")); register(unknown = new ProtocolVersion(-1, "UNKNOWN")); } 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 d23d6e46d..d84faf1b1 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 @@ -220,8 +220,8 @@ public class InventoryPackets { deleted++; continue; } - wrapper.write(Type.STRING, id); wrapper.write(Type.STRING, type); + wrapper.write(Type.STRING, id); if (type.equals("crafting_shapeless")) { wrapper.passthrough(Type.STRING); // Group 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 a64f482c2..f3113ffa1 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 @@ -1,6 +1,7 @@ package us.myles.ViaVersion.protocols.protocol1_14to1_13_2.packets; import us.myles.ViaVersion.api.PacketWrapper; +import us.myles.ViaVersion.api.minecraft.Position; import us.myles.ViaVersion.api.protocol.Protocol; import us.myles.ViaVersion.api.remapper.PacketHandler; import us.myles.ViaVersion.api.remapper.PacketRemapper; @@ -107,7 +108,25 @@ public class PlayerPackets { protocol.registerIncoming(State.PLAY, 0x29, 0x29, new PacketRemapper() { @Override public void registerMap() { - map(Type.POSITION1_14, Type.POSITION); + handler(new PacketHandler() { + @Override + public void handle(PacketWrapper wrapper) throws Exception { + int hand = wrapper.read(Type.VAR_INT); + Position position = wrapper.read(Type.POSITION1_14); + int face = wrapper.read(Type.VAR_INT); + float x = wrapper.read(Type.FLOAT); + float y = wrapper.read(Type.FLOAT); + float z = wrapper.read(Type.FLOAT); + wrapper.read(Type.BOOLEAN); // new unknown boolean + + wrapper.write(Type.POSITION, position); + wrapper.write(Type.VAR_INT, face); + wrapper.write(Type.VAR_INT, hand); + wrapper.write(Type.FLOAT, x); + wrapper.write(Type.FLOAT, y); + wrapper.write(Type.FLOAT, z); + } + }); } }); } 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 bd2aada6d..08702bc6f 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 @@ -10895,28 +10895,61 @@ "10892": "minecraft:bell[attachment=double_wall,facing=east]", "10893": "minecraft:lantern[hanging=true]", "10894": "minecraft:lantern[hanging=false]", - "10895": "minecraft:sweet_berry_bush[age=0]", - "10896": "minecraft:sweet_berry_bush[age=1]", - "10897": "minecraft:sweet_berry_bush[age=2]", - "10898": "minecraft:sweet_berry_bush[age=3]", - "10899": "minecraft:campfire[lit=true,signal_fire=true,waterlogged=true]", - "10900": "minecraft:campfire[lit=true,signal_fire=true,waterlogged=false]", - "10901": "minecraft:campfire[lit=true,signal_fire=false,waterlogged=true]", - "10902": "minecraft:campfire[lit=true,signal_fire=false,waterlogged=false]", - "10903": "minecraft:campfire[lit=false,signal_fire=true,waterlogged=true]", - "10904": "minecraft:campfire[lit=false,signal_fire=true,waterlogged=false]", - "10905": "minecraft:campfire[lit=false,signal_fire=false,waterlogged=true]", - "10906": "minecraft:campfire[lit=false,signal_fire=false,waterlogged=false]", - "10907": "minecraft:structure_block[mode=save]", - "10908": "minecraft:structure_block[mode=load]", - "10909": "minecraft:structure_block[mode=corner]", - "10910": "minecraft:structure_block[mode=data]", - "10911": "minecraft:jigsaw[facing=north]", - "10912": "minecraft:jigsaw[facing=east]", - "10913": "minecraft:jigsaw[facing=south]", - "10914": "minecraft:jigsaw[facing=west]", - "10915": "minecraft:jigsaw[facing=up]", - "10916": "minecraft:jigsaw[facing=down]" + "10895": "minecraft:campfire[facing=north,lit=true,signal_fire=true,waterlogged=true]", + "10896": "minecraft:campfire[facing=north,lit=true,signal_fire=true,waterlogged=false]", + "10897": "minecraft:campfire[facing=north,lit=true,signal_fire=false,waterlogged=true]", + "10898": "minecraft:campfire[facing=north,lit=true,signal_fire=false,waterlogged=false]", + "10899": "minecraft:campfire[facing=north,lit=false,signal_fire=true,waterlogged=true]", + "10900": "minecraft:campfire[facing=north,lit=false,signal_fire=true,waterlogged=false]", + "10901": "minecraft:campfire[facing=north,lit=false,signal_fire=false,waterlogged=true]", + "10902": "minecraft:campfire[facing=north,lit=false,signal_fire=false,waterlogged=false]", + "10903": "minecraft:campfire[facing=south,lit=true,signal_fire=true,waterlogged=true]", + "10904": "minecraft:campfire[facing=south,lit=true,signal_fire=true,waterlogged=false]", + "10905": "minecraft:campfire[facing=south,lit=true,signal_fire=false,waterlogged=true]", + "10906": "minecraft:campfire[facing=south,lit=true,signal_fire=false,waterlogged=false]", + "10907": "minecraft:campfire[facing=south,lit=false,signal_fire=true,waterlogged=true]", + "10908": "minecraft:campfire[facing=south,lit=false,signal_fire=true,waterlogged=false]", + "10909": "minecraft:campfire[facing=south,lit=false,signal_fire=false,waterlogged=true]", + "10910": "minecraft:campfire[facing=south,lit=false,signal_fire=false,waterlogged=false]", + "10911": "minecraft:campfire[facing=west,lit=true,signal_fire=true,waterlogged=true]", + "10912": "minecraft:campfire[facing=west,lit=true,signal_fire=true,waterlogged=false]", + "10913": "minecraft:campfire[facing=west,lit=true,signal_fire=false,waterlogged=true]", + "10914": "minecraft:campfire[facing=west,lit=true,signal_fire=false,waterlogged=false]", + "10915": "minecraft:campfire[facing=west,lit=false,signal_fire=true,waterlogged=true]", + "10916": "minecraft:campfire[facing=west,lit=false,signal_fire=true,waterlogged=false]", + "10917": "minecraft:campfire[facing=west,lit=false,signal_fire=false,waterlogged=true]", + "10918": "minecraft:campfire[facing=west,lit=false,signal_fire=false,waterlogged=false]", + "10919": "minecraft:campfire[facing=east,lit=true,signal_fire=true,waterlogged=true]", + "10920": "minecraft:campfire[facing=east,lit=true,signal_fire=true,waterlogged=false]", + "10921": "minecraft:campfire[facing=east,lit=true,signal_fire=false,waterlogged=true]", + "10922": "minecraft:campfire[facing=east,lit=true,signal_fire=false,waterlogged=false]", + "10923": "minecraft:campfire[facing=east,lit=false,signal_fire=true,waterlogged=true]", + "10924": "minecraft:campfire[facing=east,lit=false,signal_fire=true,waterlogged=false]", + "10925": "minecraft:campfire[facing=east,lit=false,signal_fire=false,waterlogged=true]", + "10926": "minecraft:campfire[facing=east,lit=false,signal_fire=false,waterlogged=false]", + "10927": "minecraft:sweet_berry_bush[age=0]", + "10928": "minecraft:sweet_berry_bush[age=1]", + "10929": "minecraft:sweet_berry_bush[age=2]", + "10930": "minecraft:sweet_berry_bush[age=3]", + "10931": "minecraft:structure_block[mode=save]", + "10932": "minecraft:structure_block[mode=load]", + "10933": "minecraft:structure_block[mode=corner]", + "10934": "minecraft:structure_block[mode=data]", + "10935": "minecraft:jigsaw[facing=north]", + "10936": "minecraft:jigsaw[facing=east]", + "10937": "minecraft:jigsaw[facing=south]", + "10938": "minecraft:jigsaw[facing=west]", + "10939": "minecraft:jigsaw[facing=up]", + "10940": "minecraft:jigsaw[facing=down]", + "10941": "minecraft:composter[level=0]", + "10942": "minecraft:composter[level=1]", + "10943": "minecraft:composter[level=2]", + "10944": "minecraft:composter[level=3]", + "10945": "minecraft:composter[level=4]", + "10946": "minecraft:composter[level=5]", + "10947": "minecraft:composter[level=6]", + "10948": "minecraft:composter[level=7]", + "10949": "minecraft:composter[level=8]" }, "items": { "0": "minecraft:air", @@ -11434,360 +11467,361 @@ "512": "minecraft:comparator", "513": "minecraft:structure_block", "514": "minecraft:jigsaw", - "515": "minecraft:turtle_helmet", - "516": "minecraft:scute", - "517": "minecraft:iron_shovel", - "518": "minecraft:iron_pickaxe", - "519": "minecraft:iron_axe", - "520": "minecraft:flint_and_steel", - "521": "minecraft:apple", - "522": "minecraft:bow", - "523": "minecraft:arrow", - "524": "minecraft:coal", - "525": "minecraft:charcoal", - "526": "minecraft:diamond", - "527": "minecraft:iron_ingot", - "528": "minecraft:gold_ingot", - "529": "minecraft:iron_sword", - "530": "minecraft:wooden_sword", - "531": "minecraft:wooden_shovel", - "532": "minecraft:wooden_pickaxe", - "533": "minecraft:wooden_axe", - "534": "minecraft:stone_sword", - "535": "minecraft:stone_shovel", - "536": "minecraft:stone_pickaxe", - "537": "minecraft:stone_axe", - "538": "minecraft:diamond_sword", - "539": "minecraft:diamond_shovel", - "540": "minecraft:diamond_pickaxe", - "541": "minecraft:diamond_axe", - "542": "minecraft:stick", - "543": "minecraft:bowl", - "544": "minecraft:mushroom_stew", - "545": "minecraft:golden_sword", - "546": "minecraft:golden_shovel", - "547": "minecraft:golden_pickaxe", - "548": "minecraft:golden_axe", - "549": "minecraft:string", - "550": "minecraft:feather", - "551": "minecraft:gunpowder", - "552": "minecraft:wooden_hoe", - "553": "minecraft:stone_hoe", - "554": "minecraft:iron_hoe", - "555": "minecraft:diamond_hoe", - "556": "minecraft:golden_hoe", - "557": "minecraft:wheat_seeds", - "558": "minecraft:wheat", - "559": "minecraft:bread", - "560": "minecraft:leather_helmet", - "561": "minecraft:leather_chestplate", - "562": "minecraft:leather_leggings", - "563": "minecraft:leather_boots", - "564": "minecraft:chainmail_helmet", - "565": "minecraft:chainmail_chestplate", - "566": "minecraft:chainmail_leggings", - "567": "minecraft:chainmail_boots", - "568": "minecraft:iron_helmet", - "569": "minecraft:iron_chestplate", - "570": "minecraft:iron_leggings", - "571": "minecraft:iron_boots", - "572": "minecraft:diamond_helmet", - "573": "minecraft:diamond_chestplate", - "574": "minecraft:diamond_leggings", - "575": "minecraft:diamond_boots", - "576": "minecraft:golden_helmet", - "577": "minecraft:golden_chestplate", - "578": "minecraft:golden_leggings", - "579": "minecraft:golden_boots", - "580": "minecraft:flint", - "581": "minecraft:porkchop", - "582": "minecraft:cooked_porkchop", - "583": "minecraft:painting", - "584": "minecraft:golden_apple", - "585": "minecraft:enchanted_golden_apple", - "586": "minecraft:oak_sign", - "587": "minecraft:spruce_sign", - "588": "minecraft:birch_sign", - "589": "minecraft:acacia_sign", - "590": "minecraft:jungle_sign", - "591": "minecraft:dark_oak_sign", - "592": "minecraft:bucket", - "593": "minecraft:water_bucket", - "594": "minecraft:lava_bucket", - "595": "minecraft:minecart", - "596": "minecraft:saddle", - "597": "minecraft:redstone", - "598": "minecraft:snowball", - "599": "minecraft:oak_boat", - "600": "minecraft:leather", - "601": "minecraft:milk_bucket", - "602": "minecraft:pufferfish_bucket", - "603": "minecraft:salmon_bucket", - "604": "minecraft:cod_bucket", - "605": "minecraft:tropical_fish_bucket", - "606": "minecraft:brick", - "607": "minecraft:clay_ball", - "608": "minecraft:sugar_cane", - "609": "minecraft:kelp", - "610": "minecraft:dried_kelp_block", - "611": "minecraft:bamboo", - "612": "minecraft:paper", - "613": "minecraft:book", - "614": "minecraft:slime_ball", - "615": "minecraft:chest_minecart", - "616": "minecraft:furnace_minecart", - "617": "minecraft:egg", - "618": "minecraft:compass", - "619": "minecraft:fishing_rod", - "620": "minecraft:clock", - "621": "minecraft:glowstone_dust", - "622": "minecraft:cod", - "623": "minecraft:salmon", - "624": "minecraft:tropical_fish", - "625": "minecraft:pufferfish", - "626": "minecraft:cooked_cod", - "627": "minecraft:cooked_salmon", - "628": "minecraft:ink_sac", - "629": "minecraft:red_dye", - "630": "minecraft:green_dye", - "631": "minecraft:cocoa_beans", - "632": "minecraft:lapis_lazuli", - "633": "minecraft:purple_dye", - "634": "minecraft:cyan_dye", - "635": "minecraft:light_gray_dye", - "636": "minecraft:gray_dye", - "637": "minecraft:pink_dye", - "638": "minecraft:lime_dye", - "639": "minecraft:yellow_dye", - "640": "minecraft:light_blue_dye", - "641": "minecraft:magenta_dye", - "642": "minecraft:orange_dye", - "643": "minecraft:bone_meal", - "644": "minecraft:blue_dye", - "645": "minecraft:brown_dye", - "646": "minecraft:black_dye", - "647": "minecraft:white_dye", - "648": "minecraft:bone", - "649": "minecraft:sugar", - "650": "minecraft:cake", - "651": "minecraft:white_bed", - "652": "minecraft:orange_bed", - "653": "minecraft:magenta_bed", - "654": "minecraft:light_blue_bed", - "655": "minecraft:yellow_bed", - "656": "minecraft:lime_bed", - "657": "minecraft:pink_bed", - "658": "minecraft:gray_bed", - "659": "minecraft:light_gray_bed", - "660": "minecraft:cyan_bed", - "661": "minecraft:purple_bed", - "662": "minecraft:blue_bed", - "663": "minecraft:brown_bed", - "664": "minecraft:green_bed", - "665": "minecraft:red_bed", - "666": "minecraft:black_bed", - "667": "minecraft:cookie", - "668": "minecraft:filled_map", - "669": "minecraft:shears", - "670": "minecraft:melon_slice", - "671": "minecraft:dried_kelp", - "672": "minecraft:pumpkin_seeds", - "673": "minecraft:melon_seeds", - "674": "minecraft:beef", - "675": "minecraft:cooked_beef", - "676": "minecraft:chicken", - "677": "minecraft:cooked_chicken", - "678": "minecraft:rotten_flesh", - "679": "minecraft:ender_pearl", - "680": "minecraft:blaze_rod", - "681": "minecraft:ghast_tear", - "682": "minecraft:gold_nugget", - "683": "minecraft:nether_wart", - "684": "minecraft:potion", - "685": "minecraft:glass_bottle", - "686": "minecraft:spider_eye", - "687": "minecraft:fermented_spider_eye", - "688": "minecraft:blaze_powder", - "689": "minecraft:magma_cream", - "690": "minecraft:brewing_stand", - "691": "minecraft:cauldron", - "692": "minecraft:ender_eye", - "693": "minecraft:glistering_melon_slice", - "694": "minecraft:bat_spawn_egg", - "695": "minecraft:blaze_spawn_egg", - "696": "minecraft:cat_spawn_egg", - "697": "minecraft:cave_spider_spawn_egg", - "698": "minecraft:chicken_spawn_egg", - "699": "minecraft:cod_spawn_egg", - "700": "minecraft:cow_spawn_egg", - "701": "minecraft:creeper_spawn_egg", - "702": "minecraft:dolphin_spawn_egg", - "703": "minecraft:donkey_spawn_egg", - "704": "minecraft:drowned_spawn_egg", - "705": "minecraft:elder_guardian_spawn_egg", - "706": "minecraft:enderman_spawn_egg", - "707": "minecraft:endermite_spawn_egg", - "708": "minecraft:evoker_spawn_egg", - "709": "minecraft:ghast_spawn_egg", - "710": "minecraft:guardian_spawn_egg", - "711": "minecraft:horse_spawn_egg", - "712": "minecraft:husk_spawn_egg", - "713": "minecraft:illager_beast_spawn_egg", - "714": "minecraft:llama_spawn_egg", - "715": "minecraft:magma_cube_spawn_egg", - "716": "minecraft:mooshroom_spawn_egg", - "717": "minecraft:mule_spawn_egg", - "718": "minecraft:ocelot_spawn_egg", - "719": "minecraft:panda_spawn_egg", - "720": "minecraft:parrot_spawn_egg", - "721": "minecraft:phantom_spawn_egg", - "722": "minecraft:pig_spawn_egg", - "723": "minecraft:pillager_spawn_egg", - "724": "minecraft:polar_bear_spawn_egg", - "725": "minecraft:pufferfish_spawn_egg", - "726": "minecraft:rabbit_spawn_egg", - "727": "minecraft:salmon_spawn_egg", - "728": "minecraft:sheep_spawn_egg", - "729": "minecraft:shulker_spawn_egg", - "730": "minecraft:silverfish_spawn_egg", - "731": "minecraft:skeleton_spawn_egg", - "732": "minecraft:skeleton_horse_spawn_egg", - "733": "minecraft:slime_spawn_egg", - "734": "minecraft:spider_spawn_egg", - "735": "minecraft:squid_spawn_egg", - "736": "minecraft:stray_spawn_egg", - "737": "minecraft:tropical_fish_spawn_egg", - "738": "minecraft:turtle_spawn_egg", - "739": "minecraft:vex_spawn_egg", - "740": "minecraft:villager_spawn_egg", - "741": "minecraft:vindicator_spawn_egg", - "742": "minecraft:witch_spawn_egg", - "743": "minecraft:wither_skeleton_spawn_egg", - "744": "minecraft:wolf_spawn_egg", - "745": "minecraft:zombie_spawn_egg", - "746": "minecraft:zombie_horse_spawn_egg", - "747": "minecraft:zombie_pigman_spawn_egg", - "748": "minecraft:zombie_villager_spawn_egg", - "749": "minecraft:experience_bottle", - "750": "minecraft:fire_charge", - "751": "minecraft:writable_book", - "752": "minecraft:written_book", - "753": "minecraft:emerald", - "754": "minecraft:item_frame", - "755": "minecraft:flower_pot", - "756": "minecraft:carrot", - "757": "minecraft:potato", - "758": "minecraft:baked_potato", - "759": "minecraft:poisonous_potato", - "760": "minecraft:map", - "761": "minecraft:golden_carrot", - "762": "minecraft:skeleton_skull", - "763": "minecraft:wither_skeleton_skull", - "764": "minecraft:player_head", - "765": "minecraft:zombie_head", - "766": "minecraft:creeper_head", - "767": "minecraft:dragon_head", - "768": "minecraft:carrot_on_a_stick", - "769": "minecraft:nether_star", - "770": "minecraft:pumpkin_pie", - "771": "minecraft:firework_rocket", - "772": "minecraft:firework_star", - "773": "minecraft:enchanted_book", - "774": "minecraft:nether_brick", - "775": "minecraft:quartz", - "776": "minecraft:tnt_minecart", - "777": "minecraft:hopper_minecart", - "778": "minecraft:prismarine_shard", - "779": "minecraft:prismarine_crystals", - "780": "minecraft:rabbit", - "781": "minecraft:cooked_rabbit", - "782": "minecraft:rabbit_stew", - "783": "minecraft:rabbit_foot", - "784": "minecraft:rabbit_hide", - "785": "minecraft:armor_stand", - "786": "minecraft:iron_horse_armor", - "787": "minecraft:golden_horse_armor", - "788": "minecraft:diamond_horse_armor", - "789": "minecraft:lead", - "790": "minecraft:name_tag", - "791": "minecraft:command_block_minecart", - "792": "minecraft:mutton", - "793": "minecraft:cooked_mutton", - "794": "minecraft:white_banner", - "795": "minecraft:orange_banner", - "796": "minecraft:magenta_banner", - "797": "minecraft:light_blue_banner", - "798": "minecraft:yellow_banner", - "799": "minecraft:lime_banner", - "800": "minecraft:pink_banner", - "801": "minecraft:gray_banner", - "802": "minecraft:light_gray_banner", - "803": "minecraft:cyan_banner", - "804": "minecraft:purple_banner", - "805": "minecraft:blue_banner", - "806": "minecraft:brown_banner", - "807": "minecraft:green_banner", - "808": "minecraft:red_banner", - "809": "minecraft:black_banner", - "810": "minecraft:end_crystal", - "811": "minecraft:chorus_fruit", - "812": "minecraft:popped_chorus_fruit", - "813": "minecraft:beetroot", - "814": "minecraft:beetroot_seeds", - "815": "minecraft:beetroot_soup", - "816": "minecraft:dragon_breath", - "817": "minecraft:splash_potion", - "818": "minecraft:spectral_arrow", - "819": "minecraft:tipped_arrow", - "820": "minecraft:lingering_potion", - "821": "minecraft:shield", - "822": "minecraft:elytra", - "823": "minecraft:spruce_boat", - "824": "minecraft:birch_boat", - "825": "minecraft:jungle_boat", - "826": "minecraft:acacia_boat", - "827": "minecraft:dark_oak_boat", - "828": "minecraft:totem_of_undying", - "829": "minecraft:shulker_shell", - "830": "minecraft:iron_nugget", - "831": "minecraft:knowledge_book", - "832": "minecraft:debug_stick", - "833": "minecraft:music_disc_13", - "834": "minecraft:music_disc_cat", - "835": "minecraft:music_disc_blocks", - "836": "minecraft:music_disc_chirp", - "837": "minecraft:music_disc_far", - "838": "minecraft:music_disc_mall", - "839": "minecraft:music_disc_mellohi", - "840": "minecraft:music_disc_stal", - "841": "minecraft:music_disc_strad", - "842": "minecraft:music_disc_ward", - "843": "minecraft:music_disc_11", - "844": "minecraft:music_disc_wait", - "845": "minecraft:trident", - "846": "minecraft:phantom_membrane", - "847": "minecraft:nautilus_shell", - "848": "minecraft:heart_of_the_sea", - "849": "minecraft:crossbow", - "850": "minecraft:suspicious_stew", - "851": "minecraft:loom", - "852": "minecraft:flower_banner_pattern", - "853": "minecraft:creeper_banner_pattern", - "854": "minecraft:skull_banner_pattern", - "855": "minecraft:mojang_banner_pattern", - "856": "minecraft:barrel", - "857": "minecraft:smoker", - "858": "minecraft:blast_furnace", - "859": "minecraft:cartography_table", - "860": "minecraft:fletching_table", - "861": "minecraft:grindstone", - "862": "minecraft:lectern", - "863": "minecraft:smithing_table", - "864": "minecraft:stonecutter", - "865": "minecraft:bell", - "866": "minecraft:lantern", - "867": "minecraft:sweet_berries", - "868": "minecraft:campfire" + "515": "minecraft:composter", + "516": "minecraft:turtle_helmet", + "517": "minecraft:scute", + "518": "minecraft:iron_shovel", + "519": "minecraft:iron_pickaxe", + "520": "minecraft:iron_axe", + "521": "minecraft:flint_and_steel", + "522": "minecraft:apple", + "523": "minecraft:bow", + "524": "minecraft:arrow", + "525": "minecraft:coal", + "526": "minecraft:charcoal", + "527": "minecraft:diamond", + "528": "minecraft:iron_ingot", + "529": "minecraft:gold_ingot", + "530": "minecraft:iron_sword", + "531": "minecraft:wooden_sword", + "532": "minecraft:wooden_shovel", + "533": "minecraft:wooden_pickaxe", + "534": "minecraft:wooden_axe", + "535": "minecraft:stone_sword", + "536": "minecraft:stone_shovel", + "537": "minecraft:stone_pickaxe", + "538": "minecraft:stone_axe", + "539": "minecraft:diamond_sword", + "540": "minecraft:diamond_shovel", + "541": "minecraft:diamond_pickaxe", + "542": "minecraft:diamond_axe", + "543": "minecraft:stick", + "544": "minecraft:bowl", + "545": "minecraft:mushroom_stew", + "546": "minecraft:golden_sword", + "547": "minecraft:golden_shovel", + "548": "minecraft:golden_pickaxe", + "549": "minecraft:golden_axe", + "550": "minecraft:string", + "551": "minecraft:feather", + "552": "minecraft:gunpowder", + "553": "minecraft:wooden_hoe", + "554": "minecraft:stone_hoe", + "555": "minecraft:iron_hoe", + "556": "minecraft:diamond_hoe", + "557": "minecraft:golden_hoe", + "558": "minecraft:wheat_seeds", + "559": "minecraft:wheat", + "560": "minecraft:bread", + "561": "minecraft:leather_helmet", + "562": "minecraft:leather_chestplate", + "563": "minecraft:leather_leggings", + "564": "minecraft:leather_boots", + "565": "minecraft:chainmail_helmet", + "566": "minecraft:chainmail_chestplate", + "567": "minecraft:chainmail_leggings", + "568": "minecraft:chainmail_boots", + "569": "minecraft:iron_helmet", + "570": "minecraft:iron_chestplate", + "571": "minecraft:iron_leggings", + "572": "minecraft:iron_boots", + "573": "minecraft:diamond_helmet", + "574": "minecraft:diamond_chestplate", + "575": "minecraft:diamond_leggings", + "576": "minecraft:diamond_boots", + "577": "minecraft:golden_helmet", + "578": "minecraft:golden_chestplate", + "579": "minecraft:golden_leggings", + "580": "minecraft:golden_boots", + "581": "minecraft:flint", + "582": "minecraft:porkchop", + "583": "minecraft:cooked_porkchop", + "584": "minecraft:painting", + "585": "minecraft:golden_apple", + "586": "minecraft:enchanted_golden_apple", + "587": "minecraft:oak_sign", + "588": "minecraft:spruce_sign", + "589": "minecraft:birch_sign", + "590": "minecraft:acacia_sign", + "591": "minecraft:jungle_sign", + "592": "minecraft:dark_oak_sign", + "593": "minecraft:bucket", + "594": "minecraft:water_bucket", + "595": "minecraft:lava_bucket", + "596": "minecraft:minecart", + "597": "minecraft:saddle", + "598": "minecraft:redstone", + "599": "minecraft:snowball", + "600": "minecraft:oak_boat", + "601": "minecraft:leather", + "602": "minecraft:milk_bucket", + "603": "minecraft:pufferfish_bucket", + "604": "minecraft:salmon_bucket", + "605": "minecraft:cod_bucket", + "606": "minecraft:tropical_fish_bucket", + "607": "minecraft:brick", + "608": "minecraft:clay_ball", + "609": "minecraft:sugar_cane", + "610": "minecraft:kelp", + "611": "minecraft:dried_kelp_block", + "612": "minecraft:bamboo", + "613": "minecraft:paper", + "614": "minecraft:book", + "615": "minecraft:slime_ball", + "616": "minecraft:chest_minecart", + "617": "minecraft:furnace_minecart", + "618": "minecraft:egg", + "619": "minecraft:compass", + "620": "minecraft:fishing_rod", + "621": "minecraft:clock", + "622": "minecraft:glowstone_dust", + "623": "minecraft:cod", + "624": "minecraft:salmon", + "625": "minecraft:tropical_fish", + "626": "minecraft:pufferfish", + "627": "minecraft:cooked_cod", + "628": "minecraft:cooked_salmon", + "629": "minecraft:ink_sac", + "630": "minecraft:red_dye", + "631": "minecraft:green_dye", + "632": "minecraft:cocoa_beans", + "633": "minecraft:lapis_lazuli", + "634": "minecraft:purple_dye", + "635": "minecraft:cyan_dye", + "636": "minecraft:light_gray_dye", + "637": "minecraft:gray_dye", + "638": "minecraft:pink_dye", + "639": "minecraft:lime_dye", + "640": "minecraft:yellow_dye", + "641": "minecraft:light_blue_dye", + "642": "minecraft:magenta_dye", + "643": "minecraft:orange_dye", + "644": "minecraft:bone_meal", + "645": "minecraft:blue_dye", + "646": "minecraft:brown_dye", + "647": "minecraft:black_dye", + "648": "minecraft:white_dye", + "649": "minecraft:bone", + "650": "minecraft:sugar", + "651": "minecraft:cake", + "652": "minecraft:white_bed", + "653": "minecraft:orange_bed", + "654": "minecraft:magenta_bed", + "655": "minecraft:light_blue_bed", + "656": "minecraft:yellow_bed", + "657": "minecraft:lime_bed", + "658": "minecraft:pink_bed", + "659": "minecraft:gray_bed", + "660": "minecraft:light_gray_bed", + "661": "minecraft:cyan_bed", + "662": "minecraft:purple_bed", + "663": "minecraft:blue_bed", + "664": "minecraft:brown_bed", + "665": "minecraft:green_bed", + "666": "minecraft:red_bed", + "667": "minecraft:black_bed", + "668": "minecraft:cookie", + "669": "minecraft:filled_map", + "670": "minecraft:shears", + "671": "minecraft:melon_slice", + "672": "minecraft:dried_kelp", + "673": "minecraft:pumpkin_seeds", + "674": "minecraft:melon_seeds", + "675": "minecraft:beef", + "676": "minecraft:cooked_beef", + "677": "minecraft:chicken", + "678": "minecraft:cooked_chicken", + "679": "minecraft:rotten_flesh", + "680": "minecraft:ender_pearl", + "681": "minecraft:blaze_rod", + "682": "minecraft:ghast_tear", + "683": "minecraft:gold_nugget", + "684": "minecraft:nether_wart", + "685": "minecraft:potion", + "686": "minecraft:glass_bottle", + "687": "minecraft:spider_eye", + "688": "minecraft:fermented_spider_eye", + "689": "minecraft:blaze_powder", + "690": "minecraft:magma_cream", + "691": "minecraft:brewing_stand", + "692": "minecraft:cauldron", + "693": "minecraft:ender_eye", + "694": "minecraft:glistering_melon_slice", + "695": "minecraft:bat_spawn_egg", + "696": "minecraft:blaze_spawn_egg", + "697": "minecraft:cat_spawn_egg", + "698": "minecraft:cave_spider_spawn_egg", + "699": "minecraft:chicken_spawn_egg", + "700": "minecraft:cod_spawn_egg", + "701": "minecraft:cow_spawn_egg", + "702": "minecraft:creeper_spawn_egg", + "703": "minecraft:dolphin_spawn_egg", + "704": "minecraft:donkey_spawn_egg", + "705": "minecraft:drowned_spawn_egg", + "706": "minecraft:elder_guardian_spawn_egg", + "707": "minecraft:enderman_spawn_egg", + "708": "minecraft:endermite_spawn_egg", + "709": "minecraft:evoker_spawn_egg", + "710": "minecraft:ghast_spawn_egg", + "711": "minecraft:guardian_spawn_egg", + "712": "minecraft:horse_spawn_egg", + "713": "minecraft:husk_spawn_egg", + "714": "minecraft:illager_beast_spawn_egg", + "715": "minecraft:llama_spawn_egg", + "716": "minecraft:magma_cube_spawn_egg", + "717": "minecraft:mooshroom_spawn_egg", + "718": "minecraft:mule_spawn_egg", + "719": "minecraft:ocelot_spawn_egg", + "720": "minecraft:panda_spawn_egg", + "721": "minecraft:parrot_spawn_egg", + "722": "minecraft:phantom_spawn_egg", + "723": "minecraft:pig_spawn_egg", + "724": "minecraft:pillager_spawn_egg", + "725": "minecraft:polar_bear_spawn_egg", + "726": "minecraft:pufferfish_spawn_egg", + "727": "minecraft:rabbit_spawn_egg", + "728": "minecraft:salmon_spawn_egg", + "729": "minecraft:sheep_spawn_egg", + "730": "minecraft:shulker_spawn_egg", + "731": "minecraft:silverfish_spawn_egg", + "732": "minecraft:skeleton_spawn_egg", + "733": "minecraft:skeleton_horse_spawn_egg", + "734": "minecraft:slime_spawn_egg", + "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" }, "sounds": [ "ambient.cave", @@ -11829,6 +11863,8 @@ "block.bamboo_sapling.break", "block.bamboo_sapling.hit", "block.bamboo_sapling.place", + "block.barrel.close", + "block.barrel.open", "entity.bat.ambient", "entity.bat.death", "entity.bat.hurt", @@ -11851,6 +11887,7 @@ "entity.fishing_bobber.retrieve", "entity.fishing_bobber.splash", "entity.fishing_bobber.throw", + "block.blastfurnace.fire_crackle", "item.bottle.empty", "item.bottle.fill", "item.bottle.fill_dragonbreath", @@ -11897,6 +11934,10 @@ "entity.cod.flop", "entity.cod.hurt", "block.comparator.click", + "block.composter.empty", + "block.composter.fill", + "block.composter.fill_success", + "block.composter.ready", "block.conduit.activate", "block.conduit.ambient", "block.conduit.ambient.short", @@ -11910,6 +11951,8 @@ "entity.creeper.death", "entity.creeper.hurt", "entity.creeper.primed", + "block.crop.break", + "item.crop.plant", "item.crossbow.hit", "item.crossbow.loading_end", "item.crossbow.loading_middle", @@ -12161,6 +12204,8 @@ "music.menu", "music.nether", "music.under_water", + "block.nether_wart.break", + "item.nether_wart.plant", "block.note_block.basedrum", "block.note_block.bass", "block.note_block.bell", @@ -12252,6 +12297,7 @@ "entity.player.hurt", "entity.player.hurt_drown", "entity.player.hurt_on_fire", + "entity.player.hurt_sweet_berry_bush", "entity.player.levelup", "entity.player.small_fall", "entity.player.splash", @@ -12361,6 +12407,7 @@ "entity.slime.hurt_small", "entity.slime.jump_small", "entity.slime.squish_small", + "block.smoker.smoke", "entity.snowball.throw", "block.snow.break", "block.snow.fall", @@ -12394,6 +12441,9 @@ "entity.stray.death", "entity.stray.hurt", "entity.stray.step", + "block.sweet_berry_bush.break", + "block.sweet_berry_bush.place", + "item.sweet_berries.pick_from_bush", "enchant.thorns.hit", "entity.tnt.primed", "item.totem.use", @@ -13180,9 +13230,10 @@ "666": "stonecutter", "667": "bell", "668": "lantern", - "669": "sweet_berry_bush", - "670": "campfire", + "669": "campfire", + "670": "sweet_berry_bush", "671": "structure_block", - "672": "jigsaw" + "672": "jigsaw", + "673": "composter" } } \ No newline at end of file diff --git a/jar/pom.xml b/jar/pom.xml index 5f1bae972..aa9d4b35f 100644 --- a/jar/pom.xml +++ b/jar/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.0.0-19w02a + 2.0.0-19w03a 4.0.0 viaversion-jar diff --git a/pom.xml b/pom.xml index bdae648a0..c33b6cee4 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ us.myles viaversion-parent - 2.0.0-19w02a + 2.0.0-19w03a pom viaversion-parent diff --git a/sponge-legacy/pom.xml b/sponge-legacy/pom.xml index 15da7721d..47531d0c4 100644 --- a/sponge-legacy/pom.xml +++ b/sponge-legacy/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.0.0-19w02a + 2.0.0-19w03a 4.0.0 diff --git a/sponge/pom.xml b/sponge/pom.xml index 5f4d7e045..8b26749d1 100644 --- a/sponge/pom.xml +++ b/sponge/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.0.0-19w02a + 2.0.0-19w03a 4.0.0 diff --git a/velocity/pom.xml b/velocity/pom.xml index 27bcd2951..6f90e297d 100644 --- a/velocity/pom.xml +++ b/velocity/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 2.0.0-19w02a + 2.0.0-19w03a 4.0.0