diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/v1_8to1_9/data/SoundEffectMappings1_9.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_8to1_9/data/SoundEffectMappings1_9.java
index 616d2e128..3b50603a2 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/v1_8to1_9/data/SoundEffectMappings1_9.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_8to1_9/data/SoundEffectMappings1_9.java
@@ -25,8 +25,8 @@ public enum SoundEffectMappings1_9 {
     MOB_HORSE_ZOMBIE_IDLE("mob.horse.zombie.idle", "entity.zombie_horse.ambient", SoundCategories1_8.NEUTRAL),
     NOTE_SNARE("note.snare", "block.note.snare", SoundCategories1_8.RECORD),
     RANDOM_WOOD_CLICK("random.wood_click", "block.wood_button.click_on", SoundCategories1_8.BLOCK),
-    DIG_GRAVEL("dig.gravel", "block.gravel.place", SoundCategories1_8.BLOCK),
-    RANDOM_BOWHIT("random.bowhit", "block.tripwire.detach", SoundCategories1_8.NEUTRAL),
+    DIG_GRAVEL("dig.gravel", "block.gravel.break", SoundCategories1_8.BLOCK),
+    RANDOM_BOWHIT("random.bowhit", "entity.arrow.hit", SoundCategories1_8.NEUTRAL),
     DIG_GLASS("dig.glass", "block.glass.break", SoundCategories1_8.BLOCK),
     MOB_ZOMBIE_SAY("mob.zombie.say", "entity.zombie.ambient", SoundCategories1_8.HOSTILE),
     MOB_PIG_DEATH("mob.pig.death", "entity.pig.death", SoundCategories1_8.NEUTRAL),
@@ -42,34 +42,34 @@ public enum SoundEffectMappings1_9 {
     MOB_ZOMBIEPIG_ZPIGHURT("mob.zombiepig.zpighurt", "entity.zombie_pig.hurt", SoundCategories1_8.HOSTILE),
     MOB_WOLF_HOWL("mob.wolf.howl", "entity.wolf.howl", SoundCategories1_8.NEUTRAL),
     FIREWORKS_LAUNCH("fireworks.launch", "entity.firework.launch", SoundCategories1_8.AMBIENT),
-    MOB_COW_HURT("mob.cow.hurt", "entity.cow.death", SoundCategories1_8.NEUTRAL),
+    MOB_COW_HURT("mob.cow.hurt", "entity.cow.hurt", SoundCategories1_8.NEUTRAL),
     FIREWORKS_LARGEBLAST("fireworks.largeBlast", "entity.firework.large_blast", SoundCategories1_8.AMBIENT),
     MOB_BLAZE_HIT("mob.blaze.hit", "entity.blaze.hurt", SoundCategories1_8.HOSTILE),
     MOB_VILLAGER_DEATH("mob.villager.death", "entity.villager.death", SoundCategories1_8.NEUTRAL),
     MOB_BLAZE_DEATH("mob.blaze.death", "entity.blaze.death", SoundCategories1_8.HOSTILE),
     MOB_HORSE_ZOMBIE_DEATH("mob.horse.zombie.death", "entity.zombie_horse.death", SoundCategories1_8.NEUTRAL),
-    MOB_SILVERFISH_KILL("mob.silverfish.kill", "entity.endermite.death", SoundCategories1_8.HOSTILE),
+    MOB_SILVERFISH_KILL("mob.silverfish.kill", "entity.silverfish.death", SoundCategories1_8.HOSTILE),
     MOB_WOLF_PANTING("mob.wolf.panting", "entity.wolf.pant", SoundCategories1_8.NEUTRAL),
     NOTE_BASS("note.bass", "block.note.bass", SoundCategories1_8.RECORD),
-    DIG_STONE("dig.stone", "block.glass.place", SoundCategories1_8.BLOCK),
+    DIG_STONE("dig.stone", "block.stone.break", SoundCategories1_8.BLOCK),
     MOB_ENDERMEN_STARE("mob.endermen.stare", "entity.endermen.stare", SoundCategories1_8.HOSTILE),
     GAME_PLAYER_SWIM_SPLASH("game.player.swim.splash", "entity.generic.splash", SoundCategories1_8.BLOCK),
-    MOB_SLIME_SMALL("mob.slime.small", "block.slime.hit", SoundCategories1_8.HOSTILE),
+    MOB_SLIME_SMALL("mob.slime.small", "entity.small_slime.hurt", SoundCategories1_8.HOSTILE),
     MOB_GHAST_DEATH("mob.ghast.death", "entity.ghast.death", SoundCategories1_8.HOSTILE),
     MOB_GUARDIAN_ATTACK("mob.guardian.attack", "entity.guardian.attack", SoundCategories1_8.HOSTILE),
-    RANDOM_CLICK("random.click", "block.wood_pressureplate.click_on", SoundCategories1_8.BLOCK),
+    RANDOM_CLICK("random.click", "block.stone_button.click_on", SoundCategories1_8.BLOCK),
     MOB_ZOMBIEPIG_ZPIG("mob.zombiepig.zpig", "entity.zombie_pig.ambient", SoundCategories1_8.HOSTILE),
     GAME_PLAYER_DIE("game.player.die", "entity.player.death", SoundCategories1_8.PLAYER),
     FIREWORKS_TWINKLE_FAR("fireworks.twinkle_far", "entity.firework.twinkle_far", SoundCategories1_8.AMBIENT),
     MOB_GUARDIAN_LAND_IDLE("mob.guardian.land.idle", "entity.guardian.ambient_land", SoundCategories1_8.HOSTILE),
-    DIG_GRASS("dig.grass", "block.grass.place", SoundCategories1_8.BLOCK),
+    DIG_GRASS("dig.grass", "block.grass.break", SoundCategories1_8.BLOCK),
     MOB_SKELETON_STEP("mob.skeleton.step", "entity.skeleton.step", SoundCategories1_8.HOSTILE),
     MOB_WITHER_DEATH("mob.wither.death", "entity.wither.death", SoundCategories1_8.HOSTILE),
     MOB_WOLF_HURT("mob.wolf.hurt", "entity.wolf.hurt", SoundCategories1_8.NEUTRAL),
     MOB_HORSE_LEATHER("mob.horse.leather", "entity.horse.saddle", SoundCategories1_8.NEUTRAL),
     MOB_BAT_LOOP("mob.bat.loop", "entity.bat.loop", SoundCategories1_8.NEUTRAL),
     MOB_GHAST_SCREAM("mob.ghast.scream", "entity.ghast.hurt", SoundCategories1_8.HOSTILE),
-    GAME_PLAYER_HURT("game.player.hurt", "entity.player.death", SoundCategories1_8.PLAYER),
+    GAME_PLAYER_HURT("game.player.hurt", "entity.player.hurt", SoundCategories1_8.PLAYER),
     GAME_NEUTRAL_DIE("game.neutral.die", "entity.player.death", SoundCategories1_8.NEUTRAL),
     MOB_CREEPER_DEATH("mob.creeper.death", "entity.creeper.death", SoundCategories1_8.HOSTILE),
     MOB_HORSE_GALLOP("mob.horse.gallop", "entity.horse.gallop", SoundCategories1_8.NEUTRAL),
@@ -83,7 +83,7 @@ public enum SoundEffectMappings1_9 {
     MOB_SHEEP_SHEAR("mob.sheep.shear", "entity.sheep.shear", SoundCategories1_8.NEUTRAL),
     RANDOM_POP("random.pop", "entity.item.pickup", SoundCategories1_8.PLAYER),
     MOB_BAT_DEATH("mob.bat.death", "entity.bat.death", SoundCategories1_8.NEUTRAL),
-    DIG_WOOD("dig.wood", "block.ladder.break", SoundCategories1_8.BLOCK),
+    DIG_WOOD("dig.wood", "block.wood.break", SoundCategories1_8.BLOCK),
     MOB_HORSE_DONKEY_DEATH("mob.horse.donkey.death", "entity.donkey.death", SoundCategories1_8.NEUTRAL),
     FIREWORKS_BLAST("fireworks.blast", "entity.firework.blast", SoundCategories1_8.AMBIENT),
     MOB_ZOMBIEPIG_ZPIGANGRY("mob.zombiepig.zpigangry", "entity.zombie_pig.angry", SoundCategories1_8.HOSTILE),
@@ -98,7 +98,7 @@ public enum SoundEffectMappings1_9 {
     MOB_GUARDIAN_ELDER_DEATH("mob.guardian.elder.death", "entity.elder_guardian.death", SoundCategories1_8.HOSTILE),
     FIREWORKS_TWINKLE("fireworks.twinkle", "entity.firework.twinkle", SoundCategories1_8.AMBIENT),
     MOB_HORSE_SKELETON_DEATH("mob.horse.skeleton.death", "entity.skeleton_horse.death", SoundCategories1_8.NEUTRAL),
-    AMBIENT_WEATHER_RAIN("ambient.weather.rain", "weather.rain.above", SoundCategories1_8.WEATHER),
+    AMBIENT_WEATHER_RAIN("ambient.weather.rain", "weather.rain", SoundCategories1_8.WEATHER),
     PORTAL_TRIGGER("portal.trigger", "block.portal.trigger", SoundCategories1_8.BLOCK),
     RANDOM_CHESTOPEN("random.chestopen", "block.chest.open", SoundCategories1_8.BLOCK),
     MOB_HORSE_LAND("mob.horse.land", "entity.horse.land", SoundCategories1_8.NEUTRAL),
@@ -110,23 +110,23 @@ public enum SoundEffectMappings1_9 {
     NOTE_HAT("note.hat", "block.note.hat", SoundCategories1_8.RECORD),
     MOB_ZOMBIE_METAL("mob.zombie.metal", "entity.zombie.attack_iron_door", SoundCategories1_8.HOSTILE),
     MOB_VILLAGER_HAGGLE("mob.villager.haggle", "entity.villager.trading", SoundCategories1_8.NEUTRAL),
-    MOB_GHAST_FIREBALL("mob.ghast.fireball", "entity.blaze.shoot", SoundCategories1_8.HOSTILE),
+    MOB_GHAST_FIREBALL("mob.ghast.fireball", "entity.ghast.shoot", SoundCategories1_8.HOSTILE),
     MOB_IRONGOLEM_DEATH("mob.irongolem.death", "entity.irongolem.death", SoundCategories1_8.NEUTRAL),
-    RANDOM_BREAK("random.break", "item.shield.break", SoundCategories1_8.PLAYER),
+    RANDOM_BREAK("random.break", "entity.item.break", SoundCategories1_8.PLAYER),
     MOB_ZOMBIE_REMEDY("mob.zombie.remedy", "entity.zombie_villager.cure", SoundCategories1_8.HOSTILE),
-    RANDOM_BOW("random.bow", "entity.splash_potion.throw", SoundCategories1_8.NEUTRAL),
+    RANDOM_BOW("random.bow", "entity.arrow.shoot", SoundCategories1_8.NEUTRAL),
     MOB_VILLAGER_IDLE("mob.villager.idle", "entity.villager.ambient", SoundCategories1_8.NEUTRAL),
-    STEP_CLOTH("step.cloth", "block.cloth.fall", SoundCategories1_8.NEUTRAL),
-    MOB_SILVERFISH_HIT("mob.silverfish.hit", "entity.endermite.hurt", SoundCategories1_8.HOSTILE),
+    STEP_CLOTH("step.cloth", "block.cloth.step", SoundCategories1_8.NEUTRAL),
+    MOB_SILVERFISH_HIT("mob.silverfish.hit", "entity.silverfish.hurt", SoundCategories1_8.HOSTILE),
     LIQUID_LAVA("liquid.lava", "block.lava.ambient", SoundCategories1_8.BLOCK),
     GAME_NEUTRAL_HURT_FALL_BIG("game.neutral.hurt.fall.big", "entity.hostile.big_fall", SoundCategories1_8.NEUTRAL),
     FIRE_FIRE("fire.fire", "block.fire.ambient", SoundCategories1_8.BLOCK),
     MOB_ZOMBIE_WOOD("mob.zombie.wood", "entity.zombie.attack_door_wood", SoundCategories1_8.HOSTILE),
     MOB_CHICKEN_STEP("mob.chicken.step", "entity.chicken.step", SoundCategories1_8.NEUTRAL),
     MOB_GUARDIAN_LAND_HIT("mob.guardian.land.hit", "entity.guardian.hurt_land", SoundCategories1_8.HOSTILE),
-    MOB_CHICKEN_PLOP("mob.chicken.plop", "entity.donkey.chest", SoundCategories1_8.NEUTRAL),
+    MOB_CHICKEN_PLOP("mob.chicken.plop", "entity.chicken.egg", SoundCategories1_8.NEUTRAL),
     MOB_ENDERDRAGON_WINGS("mob.enderdragon.wings", "entity.enderdragon.flap", SoundCategories1_8.HOSTILE),
-    STEP_GRASS("step.grass", "block.grass.hit", SoundCategories1_8.NEUTRAL),
+    STEP_GRASS("step.grass", "block.grass.step", SoundCategories1_8.NEUTRAL),
     MOB_HORSE_BREATHE("mob.horse.breathe", "entity.horse.breathe", SoundCategories1_8.NEUTRAL),
     GAME_PLAYER_HURT_FALL_BIG("game.player.hurt.fall.big", "entity.hostile.big_fall", SoundCategories1_8.PLAYER),
     MOB_HORSE_DONKEY_IDLE("mob.horse.donkey.idle", "entity.donkey.ambient", SoundCategories1_8.NEUTRAL),
@@ -145,12 +145,12 @@ public enum SoundEffectMappings1_9 {
     RANDOM_ANVIL_LAND("random.anvil_land", "block.anvil.land", SoundCategories1_8.BLOCK),
     GAME_HOSTILE_HURT("game.hostile.hurt", "entity.player.death", SoundCategories1_8.HOSTILE),
     MINECART_INSIDE("minecart.inside", "entity.minecart.inside", SoundCategories1_8.PLAYER),
-    MOB_SLIME_BIG("mob.slime.big", "entity.slime.death", SoundCategories1_8.HOSTILE),
+    MOB_SLIME_BIG("mob.slime.big", "entity.slime.squish", SoundCategories1_8.HOSTILE),
     LIQUID_WATER("liquid.water", "block.water.ambient", SoundCategories1_8.BLOCK),
     MOB_PIG_SAY("mob.pig.say", "entity.pig.ambient", SoundCategories1_8.NEUTRAL),
     MOB_WITHER_SHOOT("mob.wither.shoot", "entity.wither.shoot", SoundCategories1_8.HOSTILE),
     ITEM_FIRECHARGE_USE("item.fireCharge.use", "entity.blaze.shoot", SoundCategories1_8.BLOCK),
-    STEP_SAND("step.sand", "block.sand.fall", SoundCategories1_8.NEUTRAL),
+    STEP_SAND("step.sand", "block.sand.step", SoundCategories1_8.NEUTRAL),
     MOB_IRONGOLEM_HIT("mob.irongolem.hit", "entity.irongolem.hurt", SoundCategories1_8.NEUTRAL),
     MOB_HORSE_DEATH("mob.horse.death", "entity.horse.death", SoundCategories1_8.NEUTRAL),
     MOB_BAT_HURT("mob.bat.hurt", "entity.bat.hurt", SoundCategories1_8.NEUTRAL),
@@ -159,7 +159,7 @@ public enum SoundEffectMappings1_9 {
     MOB_ZOMBIEPIG_ZPIGDEATH("mob.zombiepig.zpigdeath", "entity.zombie_pig.death", SoundCategories1_8.HOSTILE),
     AMBIENT_WEATHER_THUNDER("ambient.weather.thunder", "entity.lightning.thunder", SoundCategories1_8.WEATHER),
     MINECART_BASE("minecart.base", "entity.minecart.riding", SoundCategories1_8.NEUTRAL),
-    STEP_LADDER("step.ladder", "block.ladder.hit", SoundCategories1_8.NEUTRAL),
+    STEP_LADDER("step.ladder", "block.ladder.step", SoundCategories1_8.NEUTRAL),
     MOB_HORSE_DONKEY_ANGRY("mob.horse.donkey.angry", "entity.donkey.angry", SoundCategories1_8.NEUTRAL),
     AMBIENT_CAVE_CAVE("ambient.cave.cave", "ambient.cave", SoundCategories1_8.AMBIENT),
     FIREWORKS_BLAST_FAR("fireworks.blast_far", "entity.firework.blast_far", SoundCategories1_8.AMBIENT),
@@ -169,8 +169,8 @@ public enum SoundEffectMappings1_9 {
     GAME_HOSTILE_DIE("game.hostile.die", "entity.player.death", SoundCategories1_8.HOSTILE),
     MOB_CAT_HISS("mob.cat.hiss", "entity.cat.hiss", SoundCategories1_8.NEUTRAL),
     NOTE_BD("note.bd", "block.note.basedrum", SoundCategories1_8.RECORD),
-    MOB_SPIDER_SAY("mob.spider.say", "entity.spider.hurt", SoundCategories1_8.HOSTILE),
-    STEP_STONE("step.stone", "block.anvil.hit", SoundCategories1_8.NEUTRAL, true), //Is used for glass placement sound
+    MOB_SPIDER_SAY("mob.spider.say", "entity.spider.ambient", SoundCategories1_8.HOSTILE),
+    STEP_STONE("step.stone", "block.stone.step", SoundCategories1_8.NEUTRAL, true), //Is used for glass placement sound
     RANDOM_LEVELUP("random.levelup", "entity.player.levelup", SoundCategories1_8.PLAYER),
     LIQUID_LAVAPOP("liquid.lavapop", "block.lava.pop", SoundCategories1_8.BLOCK),
     MOB_SHEEP_SAY("mob.sheep.say", "entity.sheep.ambient", SoundCategories1_8.NEUTRAL),
@@ -182,8 +182,8 @@ public enum SoundEffectMappings1_9 {
     GAME_HOSTILE_HURT_FALL_SMALL("game.hostile.hurt.fall.small", "entity.generic.small_fall", SoundCategories1_8.HOSTILE),
     MOB_HORSE_ZOMBIE_HIT("mob.horse.zombie.hit", "entity.zombie_horse.hurt", SoundCategories1_8.NEUTRAL),
     MOB_IRONGOLEM_THROW("mob.irongolem.throw", "entity.irongolem.attack", SoundCategories1_8.NEUTRAL),
-    DIG_CLOTH("dig.cloth", "block.cloth.place", SoundCategories1_8.BLOCK),
-    STEP_GRAVEL("step.gravel", "block.gravel.hit", SoundCategories1_8.NEUTRAL),
+    DIG_CLOTH("dig.cloth", "block.cloth.break", SoundCategories1_8.BLOCK),
+    STEP_GRAVEL("step.gravel", "block.gravel.step", SoundCategories1_8.NEUTRAL),
     MOB_SILVERFISH_SAY("mob.silverfish.say", "entity.silverfish.ambient", SoundCategories1_8.HOSTILE),
     MOB_CAT_PURR("mob.cat.purr", "entity.cat.purr", SoundCategories1_8.NEUTRAL),
     MOB_ZOMBIE_INFECT("mob.zombie.infect", "entity.zombie.infect", SoundCategories1_8.HOSTILE),
@@ -196,13 +196,13 @@ public enum SoundEffectMappings1_9 {
     MOB_ENDERMEN_PORTAL("mob.endermen.portal", "entity.endermen.teleport", SoundCategories1_8.HOSTILE),
     MOB_HORSE_ANGRY("mob.horse.angry", "entity.horse.angry", SoundCategories1_8.NEUTRAL),
     MOB_WOLF_GROWL("mob.wolf.growl", "entity.wolf.growl", SoundCategories1_8.NEUTRAL),
-    DIG_SNOW("dig.snow", "block.snow.place", SoundCategories1_8.BLOCK),
+    DIG_SNOW("dig.snow", "block.snow.break", SoundCategories1_8.BLOCK),
     TILE_PISTON_OUT("tile.piston.out", "block.piston.extend", SoundCategories1_8.BLOCK),
     RANDOM_BURP("random.burp", "entity.player.burp", SoundCategories1_8.PLAYER),
     MOB_COW_STEP("mob.cow.step", "entity.cow.step", SoundCategories1_8.NEUTRAL),
     MOB_WITHER_HURT("mob.wither.hurt", "entity.wither.hurt", SoundCategories1_8.HOSTILE),
     MOB_GUARDIAN_LAND_DEATH("mob.guardian.land.death", "entity.elder_guardian.death_land", SoundCategories1_8.HOSTILE),
-    MOB_CHICKEN_HURT("mob.chicken.hurt", "entity.chicken.death", SoundCategories1_8.NEUTRAL),
+    MOB_CHICKEN_HURT("mob.chicken.hurt", "entity.chicken.hurt", SoundCategories1_8.NEUTRAL),
     MOB_WOLF_STEP("mob.wolf.step", "entity.wolf.step", SoundCategories1_8.NEUTRAL),
     MOB_WOLF_DEATH("mob.wolf.death", "entity.wolf.death", SoundCategories1_8.NEUTRAL),
     MOB_WOLF_WHINE("mob.wolf.whine", "entity.wolf.whine", SoundCategories1_8.NEUTRAL),
@@ -221,7 +221,7 @@ public enum SoundEffectMappings1_9 {
     FIRE_IGNITE("fire.ignite", "item.flintandsteel.use", SoundCategories1_8.BLOCK, true),
     MOB_ENDERDRAGON_HIT("mob.enderdragon.hit", "entity.enderdragon.hurt", SoundCategories1_8.HOSTILE),
     MOB_ZOMBIE_HURT("mob.zombie.hurt", "entity.zombie.hurt", SoundCategories1_8.HOSTILE),
-    RANDOM_EXPLODE("random.explode", "block.end_gateway.spawn", SoundCategories1_8.BLOCK),
+    RANDOM_EXPLODE("random.explode", "entity.generic.explode", SoundCategories1_8.BLOCK),
     MOB_SLIME_ATTACK("mob.slime.attack", "entity.slime.attack", SoundCategories1_8.HOSTILE),
     MOB_MAGMACUBE_JUMP("mob.magmacube.jump", "entity.magmacube.jump", SoundCategories1_8.HOSTILE),
     RANDOM_SPLASH("random.splash", "entity.bobber.splash", SoundCategories1_8.PLAYER),