From f71288e299769f44fe16594eb8dd5bf64bf22344 Mon Sep 17 00:00:00 2001 From: Nassim Jahnke Date: Wed, 13 Apr 2022 18:06:29 +0200 Subject: [PATCH] 22w15a --- .../api/protocol/version/ProtocolVersion.java | 2 +- .../packets/WorldPackets.java | 22 + .../assets/viaversion/data/mapping-1.19.json | 947 +++++++++--------- gradle.properties | 2 +- 4 files changed, 499 insertions(+), 474 deletions(-) diff --git a/api/src/main/java/com/viaversion/viaversion/api/protocol/version/ProtocolVersion.java b/api/src/main/java/com/viaversion/viaversion/api/protocol/version/ProtocolVersion.java index 5128f006a..9491d299c 100644 --- a/api/src/main/java/com/viaversion/viaversion/api/protocol/version/ProtocolVersion.java +++ b/api/src/main/java/com/viaversion/viaversion/api/protocol/version/ProtocolVersion.java @@ -80,7 +80,7 @@ public class ProtocolVersion { public static final ProtocolVersion v1_17_1 = register(756, "1.17.1"); public static final ProtocolVersion v1_18 = register(757, "1.18/1.18.1", new VersionRange("1.18", 0, 1)); public static final ProtocolVersion v1_18_2 = register(758, "1.18.2"); - public static final ProtocolVersion v1_19 = register(759, 78, "1.19"); + public static final ProtocolVersion v1_19 = register(759, 79, "1.19"); public static final ProtocolVersion unknown = register(-1, "UNKNOWN"); public static ProtocolVersion register(int version, String name) { diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19to1_18_2/packets/WorldPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19to1_18_2/packets/WorldPackets.java index 225d407bc..080281111 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19to1_18_2/packets/WorldPackets.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19to1_18_2/packets/WorldPackets.java @@ -24,6 +24,7 @@ import com.viaversion.viaversion.api.minecraft.chunks.DataPalette; import com.viaversion.viaversion.api.minecraft.chunks.PaletteType; import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper; import com.viaversion.viaversion.api.type.Type; +import com.viaversion.viaversion.protocols.protocol1_17to1_16_4.ServerboundPackets1_17; import com.viaversion.viaversion.protocols.protocol1_18to1_17_1.ClientboundPackets1_18; import com.viaversion.viaversion.protocols.protocol1_18to1_17_1.types.Chunk1_18Type; import com.viaversion.viaversion.protocols.protocol1_19to1_18_2.ClientboundPackets1_19; @@ -71,5 +72,26 @@ public final class WorldPackets { }); } }); + + protocol.registerServerbound(ServerboundPackets1_17.SET_BEACON_EFFECT, new PacketRemapper() { + @Override + public void registerMap() { + handler(wrapper -> { + // Primary effect + if (wrapper.read(Type.BOOLEAN)) { + wrapper.passthrough(Type.VAR_INT); + } else { + wrapper.write(Type.VAR_INT, -1); + } + + // Secondary effect + if (wrapper.read(Type.BOOLEAN)) { + wrapper.passthrough(Type.VAR_INT); + } else { + wrapper.write(Type.VAR_INT, -1); + } + }); + } + }); } } diff --git a/common/src/main/resources/assets/viaversion/data/mapping-1.19.json b/common/src/main/resources/assets/viaversion/data/mapping-1.19.json index 2fba03c5f..e20cbc9fa 100644 --- a/common/src/main/resources/assets/viaversion/data/mapping-1.19.json +++ b/common/src/main/resources/assets/viaversion/data/mapping-1.19.json @@ -22641,166 +22641,166 @@ "253": "minecraft:purpur_pillar", "254": "minecraft:purpur_stairs", "255": "minecraft:spawner", - "256": "minecraft:oak_stairs", - "257": "minecraft:chest", - "258": "minecraft:crafting_table", - "259": "minecraft:farmland", - "260": "minecraft:furnace", - "261": "minecraft:ladder", - "262": "minecraft:cobblestone_stairs", - "263": "minecraft:snow", - "264": "minecraft:ice", - "265": "minecraft:snow_block", - "266": "minecraft:cactus", - "267": "minecraft:clay", - "268": "minecraft:jukebox", - "269": "minecraft:oak_fence", - "270": "minecraft:spruce_fence", - "271": "minecraft:birch_fence", - "272": "minecraft:jungle_fence", - "273": "minecraft:acacia_fence", - "274": "minecraft:dark_oak_fence", - "275": "minecraft:mangrove_fence", - "276": "minecraft:crimson_fence", - "277": "minecraft:warped_fence", - "278": "minecraft:pumpkin", - "279": "minecraft:carved_pumpkin", - "280": "minecraft:jack_o_lantern", - "281": "minecraft:netherrack", - "282": "minecraft:soul_sand", - "283": "minecraft:soul_soil", - "284": "minecraft:basalt", - "285": "minecraft:polished_basalt", - "286": "minecraft:smooth_basalt", - "287": "minecraft:soul_torch", - "288": "minecraft:glowstone", - "289": "minecraft:infested_stone", - "290": "minecraft:infested_cobblestone", - "291": "minecraft:infested_stone_bricks", - "292": "minecraft:infested_mossy_stone_bricks", - "293": "minecraft:infested_cracked_stone_bricks", - "294": "minecraft:infested_chiseled_stone_bricks", - "295": "minecraft:infested_deepslate", - "296": "minecraft:stone_bricks", - "297": "minecraft:mossy_stone_bricks", - "298": "minecraft:cracked_stone_bricks", - "299": "minecraft:chiseled_stone_bricks", - "300": "minecraft:packed_mud", - "301": "minecraft:mud_bricks", - "302": "minecraft:deepslate_bricks", - "303": "minecraft:cracked_deepslate_bricks", - "304": "minecraft:deepslate_tiles", - "305": "minecraft:cracked_deepslate_tiles", - "306": "minecraft:chiseled_deepslate", - "307": "minecraft:reinforced_deepslate", - "308": "minecraft:brown_mushroom_block", - "309": "minecraft:red_mushroom_block", - "310": "minecraft:mushroom_stem", - "311": "minecraft:iron_bars", - "312": "minecraft:chain", - "313": "minecraft:glass_pane", - "314": "minecraft:melon", - "315": "minecraft:vine", - "316": "minecraft:glow_lichen", - "317": "minecraft:brick_stairs", - "318": "minecraft:stone_brick_stairs", - "319": "minecraft:mud_brick_stairs", - "320": "minecraft:mycelium", - "321": "minecraft:lily_pad", - "322": "minecraft:nether_bricks", - "323": "minecraft:cracked_nether_bricks", - "324": "minecraft:chiseled_nether_bricks", - "325": "minecraft:nether_brick_fence", - "326": "minecraft:nether_brick_stairs", - "327": "minecraft:sculk", - "328": "minecraft:sculk_vein", - "329": "minecraft:sculk_catalyst", - "330": "minecraft:sculk_shrieker", - "331": "minecraft:enchanting_table", - "332": "minecraft:end_portal_frame", - "333": "minecraft:end_stone", - "334": "minecraft:end_stone_bricks", - "335": "minecraft:dragon_egg", - "336": "minecraft:sandstone_stairs", - "337": "minecraft:ender_chest", - "338": "minecraft:emerald_block", + "256": "minecraft:chest", + "257": "minecraft:crafting_table", + "258": "minecraft:farmland", + "259": "minecraft:furnace", + "260": "minecraft:ladder", + "261": "minecraft:cobblestone_stairs", + "262": "minecraft:snow", + "263": "minecraft:ice", + "264": "minecraft:snow_block", + "265": "minecraft:cactus", + "266": "minecraft:clay", + "267": "minecraft:jukebox", + "268": "minecraft:oak_fence", + "269": "minecraft:spruce_fence", + "270": "minecraft:birch_fence", + "271": "minecraft:jungle_fence", + "272": "minecraft:acacia_fence", + "273": "minecraft:dark_oak_fence", + "274": "minecraft:mangrove_fence", + "275": "minecraft:crimson_fence", + "276": "minecraft:warped_fence", + "277": "minecraft:pumpkin", + "278": "minecraft:carved_pumpkin", + "279": "minecraft:jack_o_lantern", + "280": "minecraft:netherrack", + "281": "minecraft:soul_sand", + "282": "minecraft:soul_soil", + "283": "minecraft:basalt", + "284": "minecraft:polished_basalt", + "285": "minecraft:smooth_basalt", + "286": "minecraft:soul_torch", + "287": "minecraft:glowstone", + "288": "minecraft:infested_stone", + "289": "minecraft:infested_cobblestone", + "290": "minecraft:infested_stone_bricks", + "291": "minecraft:infested_mossy_stone_bricks", + "292": "minecraft:infested_cracked_stone_bricks", + "293": "minecraft:infested_chiseled_stone_bricks", + "294": "minecraft:infested_deepslate", + "295": "minecraft:stone_bricks", + "296": "minecraft:mossy_stone_bricks", + "297": "minecraft:cracked_stone_bricks", + "298": "minecraft:chiseled_stone_bricks", + "299": "minecraft:packed_mud", + "300": "minecraft:mud_bricks", + "301": "minecraft:deepslate_bricks", + "302": "minecraft:cracked_deepslate_bricks", + "303": "minecraft:deepslate_tiles", + "304": "minecraft:cracked_deepslate_tiles", + "305": "minecraft:chiseled_deepslate", + "306": "minecraft:reinforced_deepslate", + "307": "minecraft:brown_mushroom_block", + "308": "minecraft:red_mushroom_block", + "309": "minecraft:mushroom_stem", + "310": "minecraft:iron_bars", + "311": "minecraft:chain", + "312": "minecraft:glass_pane", + "313": "minecraft:melon", + "314": "minecraft:vine", + "315": "minecraft:glow_lichen", + "316": "minecraft:brick_stairs", + "317": "minecraft:stone_brick_stairs", + "318": "minecraft:mud_brick_stairs", + "319": "minecraft:mycelium", + "320": "minecraft:lily_pad", + "321": "minecraft:nether_bricks", + "322": "minecraft:cracked_nether_bricks", + "323": "minecraft:chiseled_nether_bricks", + "324": "minecraft:nether_brick_fence", + "325": "minecraft:nether_brick_stairs", + "326": "minecraft:sculk", + "327": "minecraft:sculk_vein", + "328": "minecraft:sculk_catalyst", + "329": "minecraft:sculk_shrieker", + "330": "minecraft:enchanting_table", + "331": "minecraft:end_portal_frame", + "332": "minecraft:end_stone", + "333": "minecraft:end_stone_bricks", + "334": "minecraft:dragon_egg", + "335": "minecraft:sandstone_stairs", + "336": "minecraft:ender_chest", + "337": "minecraft:emerald_block", + "338": "minecraft:oak_stairs", "339": "minecraft:spruce_stairs", "340": "minecraft:birch_stairs", "341": "minecraft:jungle_stairs", - "342": "minecraft:crimson_stairs", - "343": "minecraft:warped_stairs", - "344": "minecraft:command_block", - "345": "minecraft:beacon", - "346": "minecraft:cobblestone_wall", - "347": "minecraft:mossy_cobblestone_wall", - "348": "minecraft:brick_wall", - "349": "minecraft:prismarine_wall", - "350": "minecraft:red_sandstone_wall", - "351": "minecraft:mossy_stone_brick_wall", - "352": "minecraft:granite_wall", - "353": "minecraft:stone_brick_wall", - "354": "minecraft:mud_brick_wall", - "355": "minecraft:nether_brick_wall", - "356": "minecraft:andesite_wall", - "357": "minecraft:red_nether_brick_wall", - "358": "minecraft:sandstone_wall", - "359": "minecraft:end_stone_brick_wall", - "360": "minecraft:diorite_wall", - "361": "minecraft:blackstone_wall", - "362": "minecraft:polished_blackstone_wall", - "363": "minecraft:polished_blackstone_brick_wall", - "364": "minecraft:cobbled_deepslate_wall", - "365": "minecraft:polished_deepslate_wall", - "366": "minecraft:deepslate_brick_wall", - "367": "minecraft:deepslate_tile_wall", - "368": "minecraft:anvil", - "369": "minecraft:chipped_anvil", - "370": "minecraft:damaged_anvil", - "371": "minecraft:chiseled_quartz_block", - "372": "minecraft:quartz_block", - "373": "minecraft:quartz_bricks", - "374": "minecraft:quartz_pillar", - "375": "minecraft:quartz_stairs", - "376": "minecraft:white_terracotta", - "377": "minecraft:orange_terracotta", - "378": "minecraft:magenta_terracotta", - "379": "minecraft:light_blue_terracotta", - "380": "minecraft:yellow_terracotta", - "381": "minecraft:lime_terracotta", - "382": "minecraft:pink_terracotta", - "383": "minecraft:gray_terracotta", - "384": "minecraft:light_gray_terracotta", - "385": "minecraft:cyan_terracotta", - "386": "minecraft:purple_terracotta", - "387": "minecraft:blue_terracotta", - "388": "minecraft:brown_terracotta", - "389": "minecraft:green_terracotta", - "390": "minecraft:red_terracotta", - "391": "minecraft:black_terracotta", - "392": "minecraft:barrier", - "393": "minecraft:light", - "394": "minecraft:hay_block", - "395": "minecraft:white_carpet", - "396": "minecraft:orange_carpet", - "397": "minecraft:magenta_carpet", - "398": "minecraft:light_blue_carpet", - "399": "minecraft:yellow_carpet", - "400": "minecraft:lime_carpet", - "401": "minecraft:pink_carpet", - "402": "minecraft:gray_carpet", - "403": "minecraft:light_gray_carpet", - "404": "minecraft:cyan_carpet", - "405": "minecraft:purple_carpet", - "406": "minecraft:blue_carpet", - "407": "minecraft:brown_carpet", - "408": "minecraft:green_carpet", - "409": "minecraft:red_carpet", - "410": "minecraft:black_carpet", - "411": "minecraft:terracotta", - "412": "minecraft:packed_ice", - "413": "minecraft:acacia_stairs", - "414": "minecraft:dark_oak_stairs", - "415": "minecraft:mangrove_stairs", + "342": "minecraft:acacia_stairs", + "343": "minecraft:dark_oak_stairs", + "344": "minecraft:mangrove_stairs", + "345": "minecraft:crimson_stairs", + "346": "minecraft:warped_stairs", + "347": "minecraft:command_block", + "348": "minecraft:beacon", + "349": "minecraft:cobblestone_wall", + "350": "minecraft:mossy_cobblestone_wall", + "351": "minecraft:brick_wall", + "352": "minecraft:prismarine_wall", + "353": "minecraft:red_sandstone_wall", + "354": "minecraft:mossy_stone_brick_wall", + "355": "minecraft:granite_wall", + "356": "minecraft:stone_brick_wall", + "357": "minecraft:mud_brick_wall", + "358": "minecraft:nether_brick_wall", + "359": "minecraft:andesite_wall", + "360": "minecraft:red_nether_brick_wall", + "361": "minecraft:sandstone_wall", + "362": "minecraft:end_stone_brick_wall", + "363": "minecraft:diorite_wall", + "364": "minecraft:blackstone_wall", + "365": "minecraft:polished_blackstone_wall", + "366": "minecraft:polished_blackstone_brick_wall", + "367": "minecraft:cobbled_deepslate_wall", + "368": "minecraft:polished_deepslate_wall", + "369": "minecraft:deepslate_brick_wall", + "370": "minecraft:deepslate_tile_wall", + "371": "minecraft:anvil", + "372": "minecraft:chipped_anvil", + "373": "minecraft:damaged_anvil", + "374": "minecraft:chiseled_quartz_block", + "375": "minecraft:quartz_block", + "376": "minecraft:quartz_bricks", + "377": "minecraft:quartz_pillar", + "378": "minecraft:quartz_stairs", + "379": "minecraft:white_terracotta", + "380": "minecraft:orange_terracotta", + "381": "minecraft:magenta_terracotta", + "382": "minecraft:light_blue_terracotta", + "383": "minecraft:yellow_terracotta", + "384": "minecraft:lime_terracotta", + "385": "minecraft:pink_terracotta", + "386": "minecraft:gray_terracotta", + "387": "minecraft:light_gray_terracotta", + "388": "minecraft:cyan_terracotta", + "389": "minecraft:purple_terracotta", + "390": "minecraft:blue_terracotta", + "391": "minecraft:brown_terracotta", + "392": "minecraft:green_terracotta", + "393": "minecraft:red_terracotta", + "394": "minecraft:black_terracotta", + "395": "minecraft:barrier", + "396": "minecraft:light", + "397": "minecraft:hay_block", + "398": "minecraft:white_carpet", + "399": "minecraft:orange_carpet", + "400": "minecraft:magenta_carpet", + "401": "minecraft:light_blue_carpet", + "402": "minecraft:yellow_carpet", + "403": "minecraft:lime_carpet", + "404": "minecraft:pink_carpet", + "405": "minecraft:gray_carpet", + "406": "minecraft:light_gray_carpet", + "407": "minecraft:cyan_carpet", + "408": "minecraft:purple_carpet", + "409": "minecraft:blue_carpet", + "410": "minecraft:brown_carpet", + "411": "minecraft:green_carpet", + "412": "minecraft:red_carpet", + "413": "minecraft:black_carpet", + "414": "minecraft:terracotta", + "415": "minecraft:packed_ice", "416": "minecraft:dirt_path", "417": "minecraft:sunflower", "418": "minecraft:lilac", @@ -23219,321 +23219,321 @@ "831": "minecraft:slime_ball", "832": "minecraft:egg", "833": "minecraft:compass", - "834": "minecraft:bundle", - "835": "minecraft:fishing_rod", - "836": "minecraft:clock", - "837": "minecraft:spyglass", - "838": "minecraft:glowstone_dust", - "839": "minecraft:cod", - "840": "minecraft:salmon", - "841": "minecraft:tropical_fish", - "842": "minecraft:pufferfish", - "843": "minecraft:cooked_cod", - "844": "minecraft:cooked_salmon", - "845": "minecraft:ink_sac", - "846": "minecraft:glow_ink_sac", - "847": "minecraft:cocoa_beans", - "848": "minecraft:white_dye", - "849": "minecraft:orange_dye", - "850": "minecraft:magenta_dye", - "851": "minecraft:light_blue_dye", - "852": "minecraft:yellow_dye", - "853": "minecraft:lime_dye", - "854": "minecraft:pink_dye", - "855": "minecraft:gray_dye", - "856": "minecraft:light_gray_dye", - "857": "minecraft:cyan_dye", - "858": "minecraft:purple_dye", - "859": "minecraft:blue_dye", - "860": "minecraft:brown_dye", - "861": "minecraft:green_dye", - "862": "minecraft:red_dye", - "863": "minecraft:black_dye", - "864": "minecraft:bone_meal", - "865": "minecraft:bone", - "866": "minecraft:sugar", - "867": "minecraft:cake", - "868": "minecraft:white_bed", - "869": "minecraft:orange_bed", - "870": "minecraft:magenta_bed", - "871": "minecraft:light_blue_bed", - "872": "minecraft:yellow_bed", - "873": "minecraft:lime_bed", - "874": "minecraft:pink_bed", - "875": "minecraft:gray_bed", - "876": "minecraft:light_gray_bed", - "877": "minecraft:cyan_bed", - "878": "minecraft:purple_bed", - "879": "minecraft:blue_bed", - "880": "minecraft:brown_bed", - "881": "minecraft:green_bed", - "882": "minecraft:red_bed", - "883": "minecraft:black_bed", - "884": "minecraft:cookie", - "885": "minecraft:filled_map", - "886": "minecraft:shears", - "887": "minecraft:melon_slice", - "888": "minecraft:dried_kelp", - "889": "minecraft:pumpkin_seeds", - "890": "minecraft:melon_seeds", - "891": "minecraft:beef", - "892": "minecraft:cooked_beef", - "893": "minecraft:chicken", - "894": "minecraft:cooked_chicken", - "895": "minecraft:rotten_flesh", - "896": "minecraft:ender_pearl", - "897": "minecraft:blaze_rod", - "898": "minecraft:ghast_tear", - "899": "minecraft:gold_nugget", - "900": "minecraft:nether_wart", - "901": "minecraft:potion", - "902": "minecraft:glass_bottle", - "903": "minecraft:spider_eye", - "904": "minecraft:fermented_spider_eye", - "905": "minecraft:blaze_powder", - "906": "minecraft:magma_cream", - "907": "minecraft:brewing_stand", - "908": "minecraft:cauldron", - "909": "minecraft:ender_eye", - "910": "minecraft:glistering_melon_slice", - "911": "minecraft:allay_spawn_egg", - "912": "minecraft:axolotl_spawn_egg", - "913": "minecraft:bat_spawn_egg", - "914": "minecraft:bee_spawn_egg", - "915": "minecraft:blaze_spawn_egg", - "916": "minecraft:cat_spawn_egg", - "917": "minecraft:cave_spider_spawn_egg", - "918": "minecraft:chicken_spawn_egg", - "919": "minecraft:cod_spawn_egg", - "920": "minecraft:cow_spawn_egg", - "921": "minecraft:creeper_spawn_egg", - "922": "minecraft:dolphin_spawn_egg", - "923": "minecraft:donkey_spawn_egg", - "924": "minecraft:drowned_spawn_egg", - "925": "minecraft:elder_guardian_spawn_egg", - "926": "minecraft:enderman_spawn_egg", - "927": "minecraft:endermite_spawn_egg", - "928": "minecraft:evoker_spawn_egg", - "929": "minecraft:fox_spawn_egg", - "930": "minecraft:frog_spawn_egg", - "931": "minecraft:ghast_spawn_egg", - "932": "minecraft:glow_squid_spawn_egg", - "933": "minecraft:goat_spawn_egg", - "934": "minecraft:guardian_spawn_egg", - "935": "minecraft:hoglin_spawn_egg", - "936": "minecraft:horse_spawn_egg", - "937": "minecraft:husk_spawn_egg", - "938": "minecraft:llama_spawn_egg", - "939": "minecraft:magma_cube_spawn_egg", - "940": "minecraft:mooshroom_spawn_egg", - "941": "minecraft:mule_spawn_egg", - "942": "minecraft:ocelot_spawn_egg", - "943": "minecraft:panda_spawn_egg", - "944": "minecraft:parrot_spawn_egg", - "945": "minecraft:phantom_spawn_egg", - "946": "minecraft:pig_spawn_egg", - "947": "minecraft:piglin_spawn_egg", - "948": "minecraft:piglin_brute_spawn_egg", - "949": "minecraft:pillager_spawn_egg", - "950": "minecraft:polar_bear_spawn_egg", - "951": "minecraft:pufferfish_spawn_egg", - "952": "minecraft:rabbit_spawn_egg", - "953": "minecraft:ravager_spawn_egg", - "954": "minecraft:salmon_spawn_egg", - "955": "minecraft:sheep_spawn_egg", - "956": "minecraft:shulker_spawn_egg", - "957": "minecraft:silverfish_spawn_egg", - "958": "minecraft:skeleton_spawn_egg", - "959": "minecraft:skeleton_horse_spawn_egg", - "960": "minecraft:slime_spawn_egg", - "961": "minecraft:spider_spawn_egg", - "962": "minecraft:squid_spawn_egg", - "963": "minecraft:stray_spawn_egg", - "964": "minecraft:strider_spawn_egg", - "965": "minecraft:tadpole_spawn_egg", - "966": "minecraft:trader_llama_spawn_egg", - "967": "minecraft:tropical_fish_spawn_egg", - "968": "minecraft:turtle_spawn_egg", - "969": "minecraft:vex_spawn_egg", - "970": "minecraft:villager_spawn_egg", - "971": "minecraft:vindicator_spawn_egg", - "972": "minecraft:wandering_trader_spawn_egg", - "973": "minecraft:warden_spawn_egg", - "974": "minecraft:witch_spawn_egg", - "975": "minecraft:wither_skeleton_spawn_egg", - "976": "minecraft:wolf_spawn_egg", - "977": "minecraft:zoglin_spawn_egg", - "978": "minecraft:zombie_spawn_egg", - "979": "minecraft:zombie_horse_spawn_egg", - "980": "minecraft:zombie_villager_spawn_egg", - "981": "minecraft:zombified_piglin_spawn_egg", - "982": "minecraft:experience_bottle", - "983": "minecraft:fire_charge", - "984": "minecraft:writable_book", - "985": "minecraft:written_book", - "986": "minecraft:item_frame", - "987": "minecraft:glow_item_frame", - "988": "minecraft:flower_pot", - "989": "minecraft:carrot", - "990": "minecraft:potato", - "991": "minecraft:baked_potato", - "992": "minecraft:poisonous_potato", - "993": "minecraft:map", - "994": "minecraft:golden_carrot", - "995": "minecraft:skeleton_skull", - "996": "minecraft:wither_skeleton_skull", - "997": "minecraft:player_head", - "998": "minecraft:zombie_head", - "999": "minecraft:creeper_head", - "1000": "minecraft:dragon_head", - "1001": "minecraft:nether_star", - "1002": "minecraft:pumpkin_pie", - "1003": "minecraft:firework_rocket", - "1004": "minecraft:firework_star", - "1005": "minecraft:enchanted_book", - "1006": "minecraft:nether_brick", - "1007": "minecraft:prismarine_shard", - "1008": "minecraft:prismarine_crystals", - "1009": "minecraft:rabbit", - "1010": "minecraft:cooked_rabbit", - "1011": "minecraft:rabbit_stew", - "1012": "minecraft:rabbit_foot", - "1013": "minecraft:rabbit_hide", - "1014": "minecraft:armor_stand", - "1015": "minecraft:iron_horse_armor", - "1016": "minecraft:golden_horse_armor", - "1017": "minecraft:diamond_horse_armor", - "1018": "minecraft:leather_horse_armor", - "1019": "minecraft:lead", - "1020": "minecraft:name_tag", - "1021": "minecraft:command_block_minecart", - "1022": "minecraft:mutton", - "1023": "minecraft:cooked_mutton", - "1024": "minecraft:white_banner", - "1025": "minecraft:orange_banner", - "1026": "minecraft:magenta_banner", - "1027": "minecraft:light_blue_banner", - "1028": "minecraft:yellow_banner", - "1029": "minecraft:lime_banner", - "1030": "minecraft:pink_banner", - "1031": "minecraft:gray_banner", - "1032": "minecraft:light_gray_banner", - "1033": "minecraft:cyan_banner", - "1034": "minecraft:purple_banner", - "1035": "minecraft:blue_banner", - "1036": "minecraft:brown_banner", - "1037": "minecraft:green_banner", - "1038": "minecraft:red_banner", - "1039": "minecraft:black_banner", - "1040": "minecraft:end_crystal", - "1041": "minecraft:chorus_fruit", - "1042": "minecraft:popped_chorus_fruit", - "1043": "minecraft:beetroot", - "1044": "minecraft:beetroot_seeds", - "1045": "minecraft:beetroot_soup", - "1046": "minecraft:dragon_breath", - "1047": "minecraft:splash_potion", - "1048": "minecraft:spectral_arrow", - "1049": "minecraft:tipped_arrow", - "1050": "minecraft:lingering_potion", - "1051": "minecraft:shield", - "1052": "minecraft:totem_of_undying", - "1053": "minecraft:shulker_shell", - "1054": "minecraft:iron_nugget", - "1055": "minecraft:knowledge_book", - "1056": "minecraft:debug_stick", - "1057": "minecraft:music_disc_13", - "1058": "minecraft:music_disc_cat", - "1059": "minecraft:music_disc_blocks", - "1060": "minecraft:music_disc_chirp", - "1061": "minecraft:music_disc_far", - "1062": "minecraft:music_disc_mall", - "1063": "minecraft:music_disc_mellohi", - "1064": "minecraft:music_disc_stal", - "1065": "minecraft:music_disc_strad", - "1066": "minecraft:music_disc_ward", - "1067": "minecraft:music_disc_11", - "1068": "minecraft:music_disc_wait", - "1069": "minecraft:music_disc_otherside", - "1070": "minecraft:music_disc_pigstep", - "1071": "minecraft:trident", - "1072": "minecraft:phantom_membrane", - "1073": "minecraft:nautilus_shell", - "1074": "minecraft:heart_of_the_sea", - "1075": "minecraft:crossbow", - "1076": "minecraft:suspicious_stew", - "1077": "minecraft:loom", - "1078": "minecraft:flower_banner_pattern", - "1079": "minecraft:creeper_banner_pattern", - "1080": "minecraft:skull_banner_pattern", - "1081": "minecraft:mojang_banner_pattern", - "1082": "minecraft:globe_banner_pattern", - "1083": "minecraft:piglin_banner_pattern", - "1084": "minecraft:composter", - "1085": "minecraft:barrel", - "1086": "minecraft:smoker", - "1087": "minecraft:blast_furnace", - "1088": "minecraft:cartography_table", - "1089": "minecraft:fletching_table", - "1090": "minecraft:grindstone", - "1091": "minecraft:smithing_table", - "1092": "minecraft:stonecutter", - "1093": "minecraft:bell", - "1094": "minecraft:lantern", - "1095": "minecraft:soul_lantern", - "1096": "minecraft:sweet_berries", - "1097": "minecraft:glow_berries", - "1098": "minecraft:campfire", - "1099": "minecraft:soul_campfire", - "1100": "minecraft:shroomlight", - "1101": "minecraft:honeycomb", - "1102": "minecraft:bee_nest", - "1103": "minecraft:beehive", - "1104": "minecraft:honey_bottle", - "1105": "minecraft:honeycomb_block", - "1106": "minecraft:lodestone", - "1107": "minecraft:crying_obsidian", - "1108": "minecraft:blackstone", - "1109": "minecraft:blackstone_slab", - "1110": "minecraft:blackstone_stairs", - "1111": "minecraft:gilded_blackstone", - "1112": "minecraft:polished_blackstone", - "1113": "minecraft:polished_blackstone_slab", - "1114": "minecraft:polished_blackstone_stairs", - "1115": "minecraft:chiseled_polished_blackstone", - "1116": "minecraft:polished_blackstone_bricks", - "1117": "minecraft:polished_blackstone_brick_slab", - "1118": "minecraft:polished_blackstone_brick_stairs", - "1119": "minecraft:cracked_polished_blackstone_bricks", - "1120": "minecraft:respawn_anchor", - "1121": "minecraft:candle", - "1122": "minecraft:white_candle", - "1123": "minecraft:orange_candle", - "1124": "minecraft:magenta_candle", - "1125": "minecraft:light_blue_candle", - "1126": "minecraft:yellow_candle", - "1127": "minecraft:lime_candle", - "1128": "minecraft:pink_candle", - "1129": "minecraft:gray_candle", - "1130": "minecraft:light_gray_candle", - "1131": "minecraft:cyan_candle", - "1132": "minecraft:purple_candle", - "1133": "minecraft:blue_candle", - "1134": "minecraft:brown_candle", - "1135": "minecraft:green_candle", - "1136": "minecraft:red_candle", - "1137": "minecraft:black_candle", - "1138": "minecraft:small_amethyst_bud", - "1139": "minecraft:medium_amethyst_bud", - "1140": "minecraft:large_amethyst_bud", - "1141": "minecraft:amethyst_cluster", - "1142": "minecraft:pointed_dripstone", - "1143": "minecraft:ochre_froglight", - "1144": "minecraft:verdant_froglight", - "1145": "minecraft:pearlescent_froglight", - "1146": "minecraft:frogspawn", - "1147": "minecraft:echo_shard", - "1148": "minecraft:recovery_compass" + "834": "minecraft:recovery_compass", + "835": "minecraft:bundle", + "836": "minecraft:fishing_rod", + "837": "minecraft:clock", + "838": "minecraft:spyglass", + "839": "minecraft:glowstone_dust", + "840": "minecraft:cod", + "841": "minecraft:salmon", + "842": "minecraft:tropical_fish", + "843": "minecraft:pufferfish", + "844": "minecraft:cooked_cod", + "845": "minecraft:cooked_salmon", + "846": "minecraft:ink_sac", + "847": "minecraft:glow_ink_sac", + "848": "minecraft:cocoa_beans", + "849": "minecraft:white_dye", + "850": "minecraft:orange_dye", + "851": "minecraft:magenta_dye", + "852": "minecraft:light_blue_dye", + "853": "minecraft:yellow_dye", + "854": "minecraft:lime_dye", + "855": "minecraft:pink_dye", + "856": "minecraft:gray_dye", + "857": "minecraft:light_gray_dye", + "858": "minecraft:cyan_dye", + "859": "minecraft:purple_dye", + "860": "minecraft:blue_dye", + "861": "minecraft:brown_dye", + "862": "minecraft:green_dye", + "863": "minecraft:red_dye", + "864": "minecraft:black_dye", + "865": "minecraft:bone_meal", + "866": "minecraft:bone", + "867": "minecraft:sugar", + "868": "minecraft:cake", + "869": "minecraft:white_bed", + "870": "minecraft:orange_bed", + "871": "minecraft:magenta_bed", + "872": "minecraft:light_blue_bed", + "873": "minecraft:yellow_bed", + "874": "minecraft:lime_bed", + "875": "minecraft:pink_bed", + "876": "minecraft:gray_bed", + "877": "minecraft:light_gray_bed", + "878": "minecraft:cyan_bed", + "879": "minecraft:purple_bed", + "880": "minecraft:blue_bed", + "881": "minecraft:brown_bed", + "882": "minecraft:green_bed", + "883": "minecraft:red_bed", + "884": "minecraft:black_bed", + "885": "minecraft:cookie", + "886": "minecraft:filled_map", + "887": "minecraft:shears", + "888": "minecraft:melon_slice", + "889": "minecraft:dried_kelp", + "890": "minecraft:pumpkin_seeds", + "891": "minecraft:melon_seeds", + "892": "minecraft:beef", + "893": "minecraft:cooked_beef", + "894": "minecraft:chicken", + "895": "minecraft:cooked_chicken", + "896": "minecraft:rotten_flesh", + "897": "minecraft:ender_pearl", + "898": "minecraft:blaze_rod", + "899": "minecraft:ghast_tear", + "900": "minecraft:gold_nugget", + "901": "minecraft:nether_wart", + "902": "minecraft:potion", + "903": "minecraft:glass_bottle", + "904": "minecraft:spider_eye", + "905": "minecraft:fermented_spider_eye", + "906": "minecraft:blaze_powder", + "907": "minecraft:magma_cream", + "908": "minecraft:brewing_stand", + "909": "minecraft:cauldron", + "910": "minecraft:ender_eye", + "911": "minecraft:glistering_melon_slice", + "912": "minecraft:allay_spawn_egg", + "913": "minecraft:axolotl_spawn_egg", + "914": "minecraft:bat_spawn_egg", + "915": "minecraft:bee_spawn_egg", + "916": "minecraft:blaze_spawn_egg", + "917": "minecraft:cat_spawn_egg", + "918": "minecraft:cave_spider_spawn_egg", + "919": "minecraft:chicken_spawn_egg", + "920": "minecraft:cod_spawn_egg", + "921": "minecraft:cow_spawn_egg", + "922": "minecraft:creeper_spawn_egg", + "923": "minecraft:dolphin_spawn_egg", + "924": "minecraft:donkey_spawn_egg", + "925": "minecraft:drowned_spawn_egg", + "926": "minecraft:elder_guardian_spawn_egg", + "927": "minecraft:enderman_spawn_egg", + "928": "minecraft:endermite_spawn_egg", + "929": "minecraft:evoker_spawn_egg", + "930": "minecraft:fox_spawn_egg", + "931": "minecraft:frog_spawn_egg", + "932": "minecraft:ghast_spawn_egg", + "933": "minecraft:glow_squid_spawn_egg", + "934": "minecraft:goat_spawn_egg", + "935": "minecraft:guardian_spawn_egg", + "936": "minecraft:hoglin_spawn_egg", + "937": "minecraft:horse_spawn_egg", + "938": "minecraft:husk_spawn_egg", + "939": "minecraft:llama_spawn_egg", + "940": "minecraft:magma_cube_spawn_egg", + "941": "minecraft:mooshroom_spawn_egg", + "942": "minecraft:mule_spawn_egg", + "943": "minecraft:ocelot_spawn_egg", + "944": "minecraft:panda_spawn_egg", + "945": "minecraft:parrot_spawn_egg", + "946": "minecraft:phantom_spawn_egg", + "947": "minecraft:pig_spawn_egg", + "948": "minecraft:piglin_spawn_egg", + "949": "minecraft:piglin_brute_spawn_egg", + "950": "minecraft:pillager_spawn_egg", + "951": "minecraft:polar_bear_spawn_egg", + "952": "minecraft:pufferfish_spawn_egg", + "953": "minecraft:rabbit_spawn_egg", + "954": "minecraft:ravager_spawn_egg", + "955": "minecraft:salmon_spawn_egg", + "956": "minecraft:sheep_spawn_egg", + "957": "minecraft:shulker_spawn_egg", + "958": "minecraft:silverfish_spawn_egg", + "959": "minecraft:skeleton_spawn_egg", + "960": "minecraft:skeleton_horse_spawn_egg", + "961": "minecraft:slime_spawn_egg", + "962": "minecraft:spider_spawn_egg", + "963": "minecraft:squid_spawn_egg", + "964": "minecraft:stray_spawn_egg", + "965": "minecraft:strider_spawn_egg", + "966": "minecraft:tadpole_spawn_egg", + "967": "minecraft:trader_llama_spawn_egg", + "968": "minecraft:tropical_fish_spawn_egg", + "969": "minecraft:turtle_spawn_egg", + "970": "minecraft:vex_spawn_egg", + "971": "minecraft:villager_spawn_egg", + "972": "minecraft:vindicator_spawn_egg", + "973": "minecraft:wandering_trader_spawn_egg", + "974": "minecraft:warden_spawn_egg", + "975": "minecraft:witch_spawn_egg", + "976": "minecraft:wither_skeleton_spawn_egg", + "977": "minecraft:wolf_spawn_egg", + "978": "minecraft:zoglin_spawn_egg", + "979": "minecraft:zombie_spawn_egg", + "980": "minecraft:zombie_horse_spawn_egg", + "981": "minecraft:zombie_villager_spawn_egg", + "982": "minecraft:zombified_piglin_spawn_egg", + "983": "minecraft:experience_bottle", + "984": "minecraft:fire_charge", + "985": "minecraft:writable_book", + "986": "minecraft:written_book", + "987": "minecraft:item_frame", + "988": "minecraft:glow_item_frame", + "989": "minecraft:flower_pot", + "990": "minecraft:carrot", + "991": "minecraft:potato", + "992": "minecraft:baked_potato", + "993": "minecraft:poisonous_potato", + "994": "minecraft:map", + "995": "minecraft:golden_carrot", + "996": "minecraft:skeleton_skull", + "997": "minecraft:wither_skeleton_skull", + "998": "minecraft:player_head", + "999": "minecraft:zombie_head", + "1000": "minecraft:creeper_head", + "1001": "minecraft:dragon_head", + "1002": "minecraft:nether_star", + "1003": "minecraft:pumpkin_pie", + "1004": "minecraft:firework_rocket", + "1005": "minecraft:firework_star", + "1006": "minecraft:enchanted_book", + "1007": "minecraft:nether_brick", + "1008": "minecraft:prismarine_shard", + "1009": "minecraft:prismarine_crystals", + "1010": "minecraft:rabbit", + "1011": "minecraft:cooked_rabbit", + "1012": "minecraft:rabbit_stew", + "1013": "minecraft:rabbit_foot", + "1014": "minecraft:rabbit_hide", + "1015": "minecraft:armor_stand", + "1016": "minecraft:iron_horse_armor", + "1017": "minecraft:golden_horse_armor", + "1018": "minecraft:diamond_horse_armor", + "1019": "minecraft:leather_horse_armor", + "1020": "minecraft:lead", + "1021": "minecraft:name_tag", + "1022": "minecraft:command_block_minecart", + "1023": "minecraft:mutton", + "1024": "minecraft:cooked_mutton", + "1025": "minecraft:white_banner", + "1026": "minecraft:orange_banner", + "1027": "minecraft:magenta_banner", + "1028": "minecraft:light_blue_banner", + "1029": "minecraft:yellow_banner", + "1030": "minecraft:lime_banner", + "1031": "minecraft:pink_banner", + "1032": "minecraft:gray_banner", + "1033": "minecraft:light_gray_banner", + "1034": "minecraft:cyan_banner", + "1035": "minecraft:purple_banner", + "1036": "minecraft:blue_banner", + "1037": "minecraft:brown_banner", + "1038": "minecraft:green_banner", + "1039": "minecraft:red_banner", + "1040": "minecraft:black_banner", + "1041": "minecraft:end_crystal", + "1042": "minecraft:chorus_fruit", + "1043": "minecraft:popped_chorus_fruit", + "1044": "minecraft:beetroot", + "1045": "minecraft:beetroot_seeds", + "1046": "minecraft:beetroot_soup", + "1047": "minecraft:dragon_breath", + "1048": "minecraft:splash_potion", + "1049": "minecraft:spectral_arrow", + "1050": "minecraft:tipped_arrow", + "1051": "minecraft:lingering_potion", + "1052": "minecraft:shield", + "1053": "minecraft:totem_of_undying", + "1054": "minecraft:shulker_shell", + "1055": "minecraft:iron_nugget", + "1056": "minecraft:knowledge_book", + "1057": "minecraft:debug_stick", + "1058": "minecraft:music_disc_13", + "1059": "minecraft:music_disc_cat", + "1060": "minecraft:music_disc_blocks", + "1061": "minecraft:music_disc_chirp", + "1062": "minecraft:music_disc_far", + "1063": "minecraft:music_disc_mall", + "1064": "minecraft:music_disc_mellohi", + "1065": "minecraft:music_disc_stal", + "1066": "minecraft:music_disc_strad", + "1067": "minecraft:music_disc_ward", + "1068": "minecraft:music_disc_11", + "1069": "minecraft:music_disc_wait", + "1070": "minecraft:music_disc_otherside", + "1071": "minecraft:music_disc_pigstep", + "1072": "minecraft:trident", + "1073": "minecraft:phantom_membrane", + "1074": "minecraft:nautilus_shell", + "1075": "minecraft:heart_of_the_sea", + "1076": "minecraft:crossbow", + "1077": "minecraft:suspicious_stew", + "1078": "minecraft:loom", + "1079": "minecraft:flower_banner_pattern", + "1080": "minecraft:creeper_banner_pattern", + "1081": "minecraft:skull_banner_pattern", + "1082": "minecraft:mojang_banner_pattern", + "1083": "minecraft:globe_banner_pattern", + "1084": "minecraft:piglin_banner_pattern", + "1085": "minecraft:composter", + "1086": "minecraft:barrel", + "1087": "minecraft:smoker", + "1088": "minecraft:blast_furnace", + "1089": "minecraft:cartography_table", + "1090": "minecraft:fletching_table", + "1091": "minecraft:grindstone", + "1092": "minecraft:smithing_table", + "1093": "minecraft:stonecutter", + "1094": "minecraft:bell", + "1095": "minecraft:lantern", + "1096": "minecraft:soul_lantern", + "1097": "minecraft:sweet_berries", + "1098": "minecraft:glow_berries", + "1099": "minecraft:campfire", + "1100": "minecraft:soul_campfire", + "1101": "minecraft:shroomlight", + "1102": "minecraft:honeycomb", + "1103": "minecraft:bee_nest", + "1104": "minecraft:beehive", + "1105": "minecraft:honey_bottle", + "1106": "minecraft:honeycomb_block", + "1107": "minecraft:lodestone", + "1108": "minecraft:crying_obsidian", + "1109": "minecraft:blackstone", + "1110": "minecraft:blackstone_slab", + "1111": "minecraft:blackstone_stairs", + "1112": "minecraft:gilded_blackstone", + "1113": "minecraft:polished_blackstone", + "1114": "minecraft:polished_blackstone_slab", + "1115": "minecraft:polished_blackstone_stairs", + "1116": "minecraft:chiseled_polished_blackstone", + "1117": "minecraft:polished_blackstone_bricks", + "1118": "minecraft:polished_blackstone_brick_slab", + "1119": "minecraft:polished_blackstone_brick_stairs", + "1120": "minecraft:cracked_polished_blackstone_bricks", + "1121": "minecraft:respawn_anchor", + "1122": "minecraft:candle", + "1123": "minecraft:white_candle", + "1124": "minecraft:orange_candle", + "1125": "minecraft:magenta_candle", + "1126": "minecraft:light_blue_candle", + "1127": "minecraft:yellow_candle", + "1128": "minecraft:lime_candle", + "1129": "minecraft:pink_candle", + "1130": "minecraft:gray_candle", + "1131": "minecraft:light_gray_candle", + "1132": "minecraft:cyan_candle", + "1133": "minecraft:purple_candle", + "1134": "minecraft:blue_candle", + "1135": "minecraft:brown_candle", + "1136": "minecraft:green_candle", + "1137": "minecraft:red_candle", + "1138": "minecraft:black_candle", + "1139": "minecraft:small_amethyst_bud", + "1140": "minecraft:medium_amethyst_bud", + "1141": "minecraft:large_amethyst_bud", + "1142": "minecraft:amethyst_cluster", + "1143": "minecraft:pointed_dripstone", + "1144": "minecraft:ochre_froglight", + "1145": "minecraft:verdant_froglight", + "1146": "minecraft:pearlescent_froglight", + "1147": "minecraft:frogspawn", + "1148": "minecraft:echo_shard" }, "sounds": [ "entity.allay.ambient_with_item", @@ -24760,6 +24760,8 @@ "entity.warden.nearby_closest", "entity.warden.roar", "entity.warden.sniff", + "entity.warden.sonic_boom", + "entity.warden.sonic_charge", "entity.warden.step", "entity.warden.tendril_clicks", "block.water.ambient", @@ -24868,6 +24870,7 @@ "entity_effect", "explosion_emitter", "explosion", + "sonic_boom", "falling_dust", "firework", "fishing", diff --git a/gradle.properties b/gradle.properties index 4d89c82d8..97f8f4ba0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ # Project properties - we put these here so they can be modified without causing a recompile of the build scripts -projectVersion=4.3.0-22w14a-SNAPSHOT +projectVersion=4.3.0-22w15a-SNAPSHOT # Gradle properties org.gradle.daemon=true