Merge pull request #1662 from KennyTV/abstraction

20w07a
This commit is contained in:
Myles 2020-02-14 20:54:54 +00:00 committed by GitHub
commit b5add583c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 266 additions and 239 deletions

View File

@ -114,7 +114,9 @@ public class Entity1_16Types {
WITCH(90, ABSTRACT_MONSTER),
WITHER(91, ABSTRACT_MONSTER),
RAVAGER(99, ABSTRACT_MONSTER),
HOGLIN(100, ABSTRACT_MONSTER),
PIGLIN(101, ABSTRACT_MONSTER),
HOGLIN(100, ABSTRACT_INSENTIENT),
// Illagers
ABSTRACT_ILLAGER_BASE(-1, ABSTRACT_MONSTER),

View File

@ -83,7 +83,7 @@ public class ProtocolVersion {
register(v1_15 = new ProtocolVersion(573, "1.15"));
register(v1_15_1 = new ProtocolVersion(575, "1.15.1"));
register(v1_15_2 = new ProtocolVersion(578, "1.15.2"));
register(v1_16 = new ProtocolVersion(701, "1.16"));
register(v1_16 = new ProtocolVersion(702, "1.16"));
register(unknown = new ProtocolVersion(-1, "UNKNOWN"));
}

View File

@ -95,7 +95,9 @@ public class Protocol1_16To1_15_2 extends Protocol {
@Override
public void registerMap() {
handler(wrapper -> {
int blockTagsSize = wrapper.passthrough(Type.VAR_INT);
int blockTagsSize = wrapper.read(Type.VAR_INT);
wrapper.write(Type.VAR_INT, blockTagsSize + 1); // new tag(s)
for (int i = 0; i < blockTagsSize; i++) {
wrapper.passthrough(Type.STRING);
int[] blockIds = wrapper.passthrough(Type.VAR_INT_ARRAY_PRIMITIVE);
@ -104,6 +106,10 @@ public class Protocol1_16To1_15_2 extends Protocol {
}
}
// Only send the necessary new tags
wrapper.write(Type.STRING, "minecraft:beacon_base_blocks");
wrapper.write(Type.VAR_INT_ARRAY_PRIMITIVE, new int[]{getNewBlockId(133), getNewBlockId(134), getNewBlockId(148), getNewBlockId(265)});
int itemTagsSize = wrapper.passthrough(Type.VAR_INT);
for (int i = 0; i < itemTagsSize; i++) {
wrapper.passthrough(Type.STRING);

View File

@ -17209,191 +17209,192 @@
"748": "minecraft:fox_spawn_egg",
"749": "minecraft:ghast_spawn_egg",
"750": "minecraft:guardian_spawn_egg",
"751": "minecraft:horse_spawn_egg",
"752": "minecraft:husk_spawn_egg",
"753": "minecraft:llama_spawn_egg",
"754": "minecraft:magma_cube_spawn_egg",
"755": "minecraft:mooshroom_spawn_egg",
"756": "minecraft:mule_spawn_egg",
"757": "minecraft:ocelot_spawn_egg",
"758": "minecraft:panda_spawn_egg",
"759": "minecraft:parrot_spawn_egg",
"760": "minecraft:phantom_spawn_egg",
"761": "minecraft:pig_spawn_egg",
"762": "minecraft:hoglin_spawn_egg",
"763": "minecraft:pillager_spawn_egg",
"764": "minecraft:polar_bear_spawn_egg",
"765": "minecraft:pufferfish_spawn_egg",
"766": "minecraft:rabbit_spawn_egg",
"767": "minecraft:ravager_spawn_egg",
"768": "minecraft:salmon_spawn_egg",
"769": "minecraft:sheep_spawn_egg",
"770": "minecraft:shulker_spawn_egg",
"771": "minecraft:silverfish_spawn_egg",
"772": "minecraft:skeleton_spawn_egg",
"773": "minecraft:skeleton_horse_spawn_egg",
"774": "minecraft:slime_spawn_egg",
"775": "minecraft:spider_spawn_egg",
"776": "minecraft:squid_spawn_egg",
"777": "minecraft:stray_spawn_egg",
"778": "minecraft:trader_llama_spawn_egg",
"779": "minecraft:tropical_fish_spawn_egg",
"780": "minecraft:turtle_spawn_egg",
"781": "minecraft:vex_spawn_egg",
"782": "minecraft:villager_spawn_egg",
"783": "minecraft:vindicator_spawn_egg",
"784": "minecraft:wandering_trader_spawn_egg",
"785": "minecraft:witch_spawn_egg",
"786": "minecraft:wither_skeleton_spawn_egg",
"787": "minecraft:wolf_spawn_egg",
"788": "minecraft:zombie_spawn_egg",
"789": "minecraft:zombie_horse_spawn_egg",
"790": "minecraft:zombie_pigman_spawn_egg",
"791": "minecraft:zombie_villager_spawn_egg",
"792": "minecraft:experience_bottle",
"793": "minecraft:fire_charge",
"794": "minecraft:writable_book",
"795": "minecraft:written_book",
"796": "minecraft:emerald",
"797": "minecraft:item_frame",
"798": "minecraft:flower_pot",
"799": "minecraft:carrot",
"800": "minecraft:potato",
"801": "minecraft:baked_potato",
"802": "minecraft:poisonous_potato",
"803": "minecraft:map",
"804": "minecraft:golden_carrot",
"805": "minecraft:skeleton_skull",
"806": "minecraft:wither_skeleton_skull",
"807": "minecraft:player_head",
"808": "minecraft:zombie_head",
"809": "minecraft:creeper_head",
"810": "minecraft:dragon_head",
"811": "minecraft:carrot_on_a_stick",
"812": "minecraft:nether_star",
"813": "minecraft:pumpkin_pie",
"814": "minecraft:firework_rocket",
"815": "minecraft:firework_star",
"816": "minecraft:enchanted_book",
"817": "minecraft:nether_brick",
"818": "minecraft:quartz",
"819": "minecraft:tnt_minecart",
"820": "minecraft:hopper_minecart",
"821": "minecraft:prismarine_shard",
"822": "minecraft:prismarine_crystals",
"823": "minecraft:rabbit",
"824": "minecraft:cooked_rabbit",
"825": "minecraft:rabbit_stew",
"826": "minecraft:rabbit_foot",
"827": "minecraft:rabbit_hide",
"828": "minecraft:armor_stand",
"829": "minecraft:iron_horse_armor",
"830": "minecraft:golden_horse_armor",
"831": "minecraft:diamond_horse_armor",
"832": "minecraft:leather_horse_armor",
"833": "minecraft:lead",
"834": "minecraft:name_tag",
"835": "minecraft:command_block_minecart",
"836": "minecraft:mutton",
"837": "minecraft:cooked_mutton",
"838": "minecraft:white_banner",
"839": "minecraft:orange_banner",
"840": "minecraft:magenta_banner",
"841": "minecraft:light_blue_banner",
"842": "minecraft:yellow_banner",
"843": "minecraft:lime_banner",
"844": "minecraft:pink_banner",
"845": "minecraft:gray_banner",
"846": "minecraft:light_gray_banner",
"847": "minecraft:cyan_banner",
"848": "minecraft:purple_banner",
"849": "minecraft:blue_banner",
"850": "minecraft:brown_banner",
"851": "minecraft:green_banner",
"852": "minecraft:red_banner",
"853": "minecraft:black_banner",
"854": "minecraft:end_crystal",
"855": "minecraft:chorus_fruit",
"856": "minecraft:popped_chorus_fruit",
"857": "minecraft:beetroot",
"858": "minecraft:beetroot_seeds",
"859": "minecraft:beetroot_soup",
"860": "minecraft:dragon_breath",
"861": "minecraft:splash_potion",
"862": "minecraft:spectral_arrow",
"863": "minecraft:tipped_arrow",
"864": "minecraft:lingering_potion",
"865": "minecraft:shield",
"866": "minecraft:elytra",
"867": "minecraft:spruce_boat",
"868": "minecraft:birch_boat",
"869": "minecraft:jungle_boat",
"870": "minecraft:acacia_boat",
"871": "minecraft:dark_oak_boat",
"872": "minecraft:totem_of_undying",
"873": "minecraft:shulker_shell",
"874": "minecraft:iron_nugget",
"875": "minecraft:knowledge_book",
"876": "minecraft:debug_stick",
"877": "minecraft:music_disc_13",
"878": "minecraft:music_disc_cat",
"879": "minecraft:music_disc_blocks",
"880": "minecraft:music_disc_chirp",
"881": "minecraft:music_disc_far",
"882": "minecraft:music_disc_mall",
"883": "minecraft:music_disc_mellohi",
"884": "minecraft:music_disc_stal",
"885": "minecraft:music_disc_strad",
"886": "minecraft:music_disc_ward",
"887": "minecraft:music_disc_11",
"888": "minecraft:music_disc_wait",
"889": "minecraft:trident",
"890": "minecraft:phantom_membrane",
"891": "minecraft:nautilus_shell",
"892": "minecraft:heart_of_the_sea",
"893": "minecraft:crossbow",
"894": "minecraft:suspicious_stew",
"895": "minecraft:loom",
"896": "minecraft:flower_banner_pattern",
"897": "minecraft:creeper_banner_pattern",
"898": "minecraft:skull_banner_pattern",
"899": "minecraft:mojang_banner_pattern",
"900": "minecraft:globe_banner_pattern",
"901": "minecraft:composter",
"902": "minecraft:barrel",
"903": "minecraft:smoker",
"904": "minecraft:blast_furnace",
"905": "minecraft:cartography_table",
"906": "minecraft:fletching_table",
"907": "minecraft:grindstone",
"908": "minecraft:lectern",
"909": "minecraft:smithing_table",
"910": "minecraft:stonecutter",
"911": "minecraft:bell",
"912": "minecraft:lantern",
"913": "minecraft:soul_fire_lantern",
"914": "minecraft:sweet_berries",
"915": "minecraft:campfire",
"916": "minecraft:shroomlight",
"917": "minecraft:honeycomb",
"918": "minecraft:bee_nest",
"919": "minecraft:beehive",
"920": "minecraft:honey_bottle",
"921": "minecraft:honey_block",
"922": "minecraft:honeycomb_block",
"923": "minecraft:netherite_block",
"924": "minecraft:ancient_debris",
"925": "minecraft:netherite_ingot",
"926": "minecraft:netherite_scrap",
"927": "minecraft:netherite_sword",
"928": "minecraft:netherite_shovel",
"929": "minecraft:netherite_pickaxe",
"930": "minecraft:netherite_axe",
"931": "minecraft:netherite_hoe",
"932": "minecraft:netherite_helmet",
"933": "minecraft:netherite_chestplate",
"934": "minecraft:netherite_leggings",
"935": "minecraft:netherite_boots"
"751": "minecraft:hoglin_spawn_egg",
"752": "minecraft:horse_spawn_egg",
"753": "minecraft:husk_spawn_egg",
"754": "minecraft:llama_spawn_egg",
"755": "minecraft:magma_cube_spawn_egg",
"756": "minecraft:mooshroom_spawn_egg",
"757": "minecraft:mule_spawn_egg",
"758": "minecraft:ocelot_spawn_egg",
"759": "minecraft:panda_spawn_egg",
"760": "minecraft:parrot_spawn_egg",
"761": "minecraft:phantom_spawn_egg",
"762": "minecraft:pig_spawn_egg",
"763": "minecraft:piglin_spawn_egg",
"764": "minecraft:pillager_spawn_egg",
"765": "minecraft:polar_bear_spawn_egg",
"766": "minecraft:pufferfish_spawn_egg",
"767": "minecraft:rabbit_spawn_egg",
"768": "minecraft:ravager_spawn_egg",
"769": "minecraft:salmon_spawn_egg",
"770": "minecraft:sheep_spawn_egg",
"771": "minecraft:shulker_spawn_egg",
"772": "minecraft:silverfish_spawn_egg",
"773": "minecraft:skeleton_spawn_egg",
"774": "minecraft:skeleton_horse_spawn_egg",
"775": "minecraft:slime_spawn_egg",
"776": "minecraft:spider_spawn_egg",
"777": "minecraft:squid_spawn_egg",
"778": "minecraft:stray_spawn_egg",
"779": "minecraft:trader_llama_spawn_egg",
"780": "minecraft:tropical_fish_spawn_egg",
"781": "minecraft:turtle_spawn_egg",
"782": "minecraft:vex_spawn_egg",
"783": "minecraft:villager_spawn_egg",
"784": "minecraft:vindicator_spawn_egg",
"785": "minecraft:wandering_trader_spawn_egg",
"786": "minecraft:witch_spawn_egg",
"787": "minecraft:wither_skeleton_spawn_egg",
"788": "minecraft:wolf_spawn_egg",
"789": "minecraft:zombie_spawn_egg",
"790": "minecraft:zombie_horse_spawn_egg",
"791": "minecraft:zombie_pigman_spawn_egg",
"792": "minecraft:zombie_villager_spawn_egg",
"793": "minecraft:experience_bottle",
"794": "minecraft:fire_charge",
"795": "minecraft:writable_book",
"796": "minecraft:written_book",
"797": "minecraft:emerald",
"798": "minecraft:item_frame",
"799": "minecraft:flower_pot",
"800": "minecraft:carrot",
"801": "minecraft:potato",
"802": "minecraft:baked_potato",
"803": "minecraft:poisonous_potato",
"804": "minecraft:map",
"805": "minecraft:golden_carrot",
"806": "minecraft:skeleton_skull",
"807": "minecraft:wither_skeleton_skull",
"808": "minecraft:player_head",
"809": "minecraft:zombie_head",
"810": "minecraft:creeper_head",
"811": "minecraft:dragon_head",
"812": "minecraft:carrot_on_a_stick",
"813": "minecraft:nether_star",
"814": "minecraft:pumpkin_pie",
"815": "minecraft:firework_rocket",
"816": "minecraft:firework_star",
"817": "minecraft:enchanted_book",
"818": "minecraft:nether_brick",
"819": "minecraft:quartz",
"820": "minecraft:tnt_minecart",
"821": "minecraft:hopper_minecart",
"822": "minecraft:prismarine_shard",
"823": "minecraft:prismarine_crystals",
"824": "minecraft:rabbit",
"825": "minecraft:cooked_rabbit",
"826": "minecraft:rabbit_stew",
"827": "minecraft:rabbit_foot",
"828": "minecraft:rabbit_hide",
"829": "minecraft:armor_stand",
"830": "minecraft:iron_horse_armor",
"831": "minecraft:golden_horse_armor",
"832": "minecraft:diamond_horse_armor",
"833": "minecraft:leather_horse_armor",
"834": "minecraft:lead",
"835": "minecraft:name_tag",
"836": "minecraft:command_block_minecart",
"837": "minecraft:mutton",
"838": "minecraft:cooked_mutton",
"839": "minecraft:white_banner",
"840": "minecraft:orange_banner",
"841": "minecraft:magenta_banner",
"842": "minecraft:light_blue_banner",
"843": "minecraft:yellow_banner",
"844": "minecraft:lime_banner",
"845": "minecraft:pink_banner",
"846": "minecraft:gray_banner",
"847": "minecraft:light_gray_banner",
"848": "minecraft:cyan_banner",
"849": "minecraft:purple_banner",
"850": "minecraft:blue_banner",
"851": "minecraft:brown_banner",
"852": "minecraft:green_banner",
"853": "minecraft:red_banner",
"854": "minecraft:black_banner",
"855": "minecraft:end_crystal",
"856": "minecraft:chorus_fruit",
"857": "minecraft:popped_chorus_fruit",
"858": "minecraft:beetroot",
"859": "minecraft:beetroot_seeds",
"860": "minecraft:beetroot_soup",
"861": "minecraft:dragon_breath",
"862": "minecraft:splash_potion",
"863": "minecraft:spectral_arrow",
"864": "minecraft:tipped_arrow",
"865": "minecraft:lingering_potion",
"866": "minecraft:shield",
"867": "minecraft:elytra",
"868": "minecraft:spruce_boat",
"869": "minecraft:birch_boat",
"870": "minecraft:jungle_boat",
"871": "minecraft:acacia_boat",
"872": "minecraft:dark_oak_boat",
"873": "minecraft:totem_of_undying",
"874": "minecraft:shulker_shell",
"875": "minecraft:iron_nugget",
"876": "minecraft:knowledge_book",
"877": "minecraft:debug_stick",
"878": "minecraft:music_disc_13",
"879": "minecraft:music_disc_cat",
"880": "minecraft:music_disc_blocks",
"881": "minecraft:music_disc_chirp",
"882": "minecraft:music_disc_far",
"883": "minecraft:music_disc_mall",
"884": "minecraft:music_disc_mellohi",
"885": "minecraft:music_disc_stal",
"886": "minecraft:music_disc_strad",
"887": "minecraft:music_disc_ward",
"888": "minecraft:music_disc_11",
"889": "minecraft:music_disc_wait",
"890": "minecraft:trident",
"891": "minecraft:phantom_membrane",
"892": "minecraft:nautilus_shell",
"893": "minecraft:heart_of_the_sea",
"894": "minecraft:crossbow",
"895": "minecraft:suspicious_stew",
"896": "minecraft:loom",
"897": "minecraft:flower_banner_pattern",
"898": "minecraft:creeper_banner_pattern",
"899": "minecraft:skull_banner_pattern",
"900": "minecraft:mojang_banner_pattern",
"901": "minecraft:globe_banner_pattern",
"902": "minecraft:composter",
"903": "minecraft:barrel",
"904": "minecraft:smoker",
"905": "minecraft:blast_furnace",
"906": "minecraft:cartography_table",
"907": "minecraft:fletching_table",
"908": "minecraft:grindstone",
"909": "minecraft:lectern",
"910": "minecraft:smithing_table",
"911": "minecraft:stonecutter",
"912": "minecraft:bell",
"913": "minecraft:lantern",
"914": "minecraft:soul_fire_lantern",
"915": "minecraft:sweet_berries",
"916": "minecraft:campfire",
"917": "minecraft:shroomlight",
"918": "minecraft:honeycomb",
"919": "minecraft:bee_nest",
"920": "minecraft:beehive",
"921": "minecraft:honey_bottle",
"922": "minecraft:honey_block",
"923": "minecraft:honeycomb_block",
"924": "minecraft:netherite_block",
"925": "minecraft:ancient_debris",
"926": "minecraft:netherite_ingot",
"927": "minecraft:netherite_scrap",
"928": "minecraft:netherite_sword",
"929": "minecraft:netherite_shovel",
"930": "minecraft:netherite_pickaxe",
"931": "minecraft:netherite_axe",
"932": "minecraft:netherite_hoe",
"933": "minecraft:netherite_helmet",
"934": "minecraft:netherite_chestplate",
"935": "minecraft:netherite_leggings",
"936": "minecraft:netherite_boots"
},
"sounds": [
"ambient.cave",
@ -17484,9 +17485,6 @@
"block.bone_block.step",
"item.book.page_turn",
"item.book.put",
"entity.fishing_bobber.retrieve",
"entity.fishing_bobber.splash",
"entity.fishing_bobber.throw",
"block.blastfurnace.fire_crackle",
"item.bottle.empty",
"item.bottle.fill",
@ -17524,11 +17522,6 @@
"block.chorus_flower.death",
"block.chorus_flower.grow",
"item.chorus_fruit.teleport",
"block.wool.break",
"block.wool.fall",
"block.wool.hit",
"block.wool.place",
"block.wool.step",
"entity.cod.ambient",
"entity.cod.death",
"entity.cod.flop",
@ -17543,6 +17536,11 @@
"block.conduit.ambient.short",
"block.conduit.attack.target",
"block.conduit.deactivate",
"block.coral_block.break",
"block.coral_block.fall",
"block.coral_block.hit",
"block.coral_block.place",
"block.coral_block.step",
"entity.cow.ambient",
"entity.cow.death",
"entity.cow.hurt",
@ -17649,6 +17647,9 @@
"block.fire.ambient",
"block.fire.extinguish",
"entity.fish.swim",
"entity.fishing_bobber.retrieve",
"entity.fishing_bobber.splash",
"entity.fishing_bobber.throw",
"item.flintandsteel.use",
"entity.fox.aggro",
"entity.fox.ambient",
@ -17693,16 +17694,6 @@
"block.grass.hit",
"block.grass.place",
"block.grass.step",
"block.wet_grass.break",
"block.wet_grass.fall",
"block.wet_grass.hit",
"block.wet_grass.place",
"block.wet_grass.step",
"block.coral_block.break",
"block.coral_block.fall",
"block.coral_block.hit",
"block.coral_block.place",
"block.coral_block.step",
"block.gravel.break",
"block.gravel.fall",
"block.gravel.hit",
@ -17718,6 +17709,13 @@
"entity.guardian.hurt",
"entity.guardian.hurt_land",
"item.hoe.till",
"entity.hoglin.ambient",
"entity.hoglin.angry",
"entity.hoglin.attack",
"entity.hoglin.death",
"entity.hoglin.hurt",
"entity.hoglin.retreat",
"entity.hoglin.step",
"block.honey_block.break",
"block.honey_block.fall",
"block.honey_block.hit",
@ -17749,14 +17747,6 @@
"entity.husk.death",
"entity.husk.hurt",
"entity.husk.step",
"entity.ravager.ambient",
"entity.ravager.attack",
"entity.ravager.celebrate",
"entity.ravager.death",
"entity.ravager.hurt",
"entity.ravager.step",
"entity.ravager.stunned",
"entity.ravager.roar",
"entity.illusioner.ambient",
"entity.illusioner.cast_spell",
"entity.illusioner.death",
@ -17809,10 +17799,13 @@
"entity.llama.spit",
"entity.llama.step",
"entity.llama.swag",
"entity.magma_cube.death_small",
"entity.magma_cube.death",
"entity.magma_cube.hurt",
"entity.magma_cube.hurt_small",
"entity.magma_cube.jump",
"entity.magma_cube.squish",
"entity.magma_cube.squish_small",
"block.metal.break",
"block.metal.fall",
"block.metal.hit",
@ -17833,6 +17826,18 @@
"entity.mule.hurt",
"music.creative",
"music.credits",
"music_disc.11",
"music_disc.13",
"music_disc.blocks",
"music_disc.cat",
"music_disc.chirp",
"music_disc.far",
"music_disc.mall",
"music_disc.mellohi",
"music_disc.stal",
"music_disc.strad",
"music_disc.wait",
"music_disc.ward",
"music.dragon",
"music.end",
"music.game",
@ -17963,6 +17968,16 @@
"entity.pig.hurt",
"entity.pig.saddle",
"entity.pig.step",
"entity.piglin.admiring_item",
"entity.piglin.ambient",
"entity.piglin.angry",
"entity.piglin.celebrate",
"entity.piglin.death",
"entity.piglin.jealous",
"entity.piglin.hurt",
"entity.piglin.retreat",
"entity.piglin.step",
"entity.piglin.converted_to_zombified",
"entity.pillager.ambient",
"entity.pillager.celebrate",
"entity.pillager.death",
@ -18011,18 +18026,14 @@
"entity.rabbit.hurt",
"entity.rabbit.jump",
"event.raid.horn",
"music_disc.11",
"music_disc.13",
"music_disc.blocks",
"music_disc.cat",
"music_disc.chirp",
"music_disc.far",
"music_disc.mall",
"music_disc.mellohi",
"music_disc.stal",
"music_disc.strad",
"music_disc.wait",
"music_disc.ward",
"entity.ravager.ambient",
"entity.ravager.attack",
"entity.ravager.celebrate",
"entity.ravager.death",
"entity.ravager.hurt",
"entity.ravager.step",
"entity.ravager.stunned",
"entity.ravager.roar",
"block.nether_ore.break",
"block.nether_ore.fall",
"block.nether_ore.hit",
@ -18095,19 +18106,16 @@
"block.slime_block.hit",
"block.slime_block.place",
"block.slime_block.step",
"block.soul_sand.break",
"block.soul_sand.step",
"block.soul_sand.place",
"block.soul_sand.hit",
"block.soul_sand.fall",
"block.soul_soil.break",
"block.soul_soil.step",
"block.soul_soil.place",
"block.soul_soil.hit",
"block.soul_soil.fall",
"entity.magma_cube.death_small",
"entity.magma_cube.hurt_small",
"entity.magma_cube.squish_small",
"block.soul_sand_break",
"block.soul_sand_step",
"block.soul_sand_place",
"block.soul_sand_hit",
"block.soul_sand_fall",
"block.soul_soil_break",
"block.soul_soil_step",
"block.soul_soil_place",
"block.soul_soil_hit",
"block.soul_soil_fall",
"entity.slime.death_small",
"entity.slime.hurt_small",
"entity.slime.jump_small",
@ -18120,6 +18128,7 @@
"entity.snow_golem.death",
"entity.snow_golem.hurt",
"entity.snow_golem.shoot",
"entity.snow_golem.shear",
"block.snow.hit",
"block.snow.place",
"block.snow.step",
@ -18231,6 +18240,11 @@
"block.water.ambient",
"weather.rain",
"weather.rain.above",
"block.wet_grass.break",
"block.wet_grass.fall",
"block.wet_grass.hit",
"block.wet_grass.place",
"block.wet_grass.step",
"entity.witch.ambient",
"entity.witch.celebrate",
"entity.witch.death",
@ -18269,6 +18283,11 @@
"block.wooden_pressure_plate.click_off",
"block.wooden_pressure_plate.click_on",
"block.wood.step",
"block.wool.break",
"block.wool.fall",
"block.wool.hit",
"block.wool.place",
"block.wool.step",
"entity.zombie.ambient",
"entity.zombie.attack_wooden_door",
"entity.zombie.attack_iron_door",