diff --git a/common/src/main/resources/assets/viabackwards/data/mapping-1.16.2to1.17.json b/common/src/main/resources/assets/viabackwards/data/mapping-1.16.2to1.17.json
index 5648005c..bab11343 100644
--- a/common/src/main/resources/assets/viabackwards/data/mapping-1.16.2to1.17.json
+++ b/common/src/main/resources/assets/viabackwards/data/mapping-1.16.2to1.17.json
@@ -1191,205 +1191,205 @@
     }
   },
   "sounds": {
-    "block.amethyst_block.break": "",
+    "block.amethyst_block.break": "entity.arrow.hit_player",
     "block.amethyst_block.chime": "",
-    "block.amethyst_block.fall": "",
-    "block.amethyst_block.hit": "",
-    "block.amethyst_block.place": "",
-    "block.amethyst_block.step": "",
-    "block.amethyst_cluster.break": "",
-    "block.amethyst_cluster.fall": "",
-    "block.amethyst_cluster.hit": "",
-    "block.amethyst_cluster.place": "",
-    "block.amethyst_cluster.step": "",
-    "block.cake.add_candle": "",
-    "block.calcite.break": "",
-    "block.calcite.step": "",
-    "block.calcite.place": "",
-    "block.calcite.hit": "",
-    "block.calcite.fall": "",
-    "block.candle.ambient": "",
-    "block.candle.break": "",
-    "block.candle.extinguish": "",
-    "block.candle.fall": "",
-    "block.candle.hit": "",
-    "block.candle.place": "",
-    "block.candle.step": "",
-    "block.copper.break": "",
-    "block.copper.step": "",
-    "block.copper.place": "",
-    "block.copper.hit": "",
-    "block.copper.fall": "",
-    "block.large_amethyst_bud.break": "",
-    "block.large_amethyst_bud.place": "",
-    "block.medium_amethyst_bud.break": "",
-    "block.medium_amethyst_bud.place": "",
-    "entity.minecart.inside.underwater": "",
-    "block.small_amethyst_bud.break": "",
-    "block.small_amethyst_bud.place": "",
-    "item.spyglass.use": "",
+    "block.amethyst_block.fall": "entity.arrow.hit_player",
+    "block.amethyst_block.hit": "entity.arrow.hit_player",
+    "block.amethyst_block.place": "block.stone.place",
+    "block.amethyst_block.step": "entity.arrow.hit_player",
+    "block.amethyst_cluster.break": "entity.arrow.hit_player",
+    "block.amethyst_cluster.fall": "entity.arrow.hit_player",
+    "block.amethyst_cluster.hit": "entity.arrow.hit_player",
+    "block.amethyst_cluster.place": "block.stone.place",
+    "block.amethyst_cluster.step": "entity.arrow.hit_player",
+    "block.cake.add_candle": "block.wool.break",
+    "block.calcite.break": "block.basalt.break",
+    "block.calcite.step": "block.basalt.step",
+    "block.calcite.place": "block.basalt.place",
+    "block.calcite.hit": "block.basalt.hit",
+    "block.calcite.fall": "block.basalt.fall",
+    "block.candle.ambient": "block.fire.ambient",
+    "block.candle.break": "block.basalt.step",
+    "block.candle.extinguish": "block.fire.extinguish",
+    "block.candle.fall": "block.basalt.fall",
+    "block.candle.hit": "block.basalt.hit",
+    "block.candle.place": "block.basalt.place",
+    "block.candle.step": "block.basalt.step",
+    "block.copper.break": "block.netherite_block.break",
+    "block.copper.step": "block.netherite_block.step",
+    "block.copper.place": "block.netherite_block.place",
+    "block.copper.hit": "block.netherite_block.hit",
+    "block.copper.fall": "block.netherite_block.fall",
+    "block.large_amethyst_bud.break": "entity.arrow.hit_player",
+    "block.large_amethyst_bud.place": "entity.arrow.hit_player",
+    "block.medium_amethyst_bud.break": "entity.arrow.hit_player",
+    "block.medium_amethyst_bud.place": "entity.arrow.hit_player",
+    "entity.minecart.inside.underwater": "entity.minecart.inside",
+    "block.small_amethyst_bud.break": "entity.arrow.hit_player",
+    "block.small_amethyst_bud.place": "entity.arrow.hit_player",
+    "item.spyglass.use": "item.crossbow.quick_charge_3",
     "item.spyglass.stop_using": "",
-    "block.tuff.break": "",
-    "block.tuff.step": "",
-    "block.tuff.place": "",
-    "block.tuff.hit": "",
-    "block.tuff.fall": "",
-    "item.bucket.empty_powder_snow": "",
-    "item.bucket.fill_powder_snow": "",
-    "entity.player.hurt_freeze": "",
-    "block.powder_snow.break": "",
-    "block.powder_snow.fall": "",
-    "block.powder_snow.hit": "",
-    "block.powder_snow.place": "",
-    "block.powder_snow.step": "",
-    "block.dripstone_block.break": "",
-    "block.dripstone_block.step": "",
-    "block.dripstone_block.place": "",
-    "block.dripstone_block.hit": "",
-    "block.dripstone_block.fall": "",
-    "block.pointed_dripstone.break": "",
-    "block.pointed_dripstone.step": "",
-    "block.pointed_dripstone.place": "",
-    "block.pointed_dripstone.hit": "",
-    "block.pointed_dripstone.fall": "",
-    "block.pointed_dripstone.land": "",
-    "block.pointed_dripstone.drip_lava": "",
-    "block.pointed_dripstone.drip_water": "",
-    "block.pointed_dripstone.drip_lava_into_cauldron": "",
-    "block.pointed_dripstone.drip_water_into_cauldron": "",
-    "block.sculk_sensor.clicking": "",
+    "block.tuff.break": "block.basalt.break",
+    "block.tuff.step": "block.basalt.step",
+    "block.tuff.place": "block.basalt.place",
+    "block.tuff.hit": "block.basalt.hit",
+    "block.tuff.fall": "block.basalt.fall",
+    "item.bucket.empty_powder_snow": "item.bucket.empty",
+    "item.bucket.fill_powder_snow": "item.bucket.fill",
+    "entity.player.hurt_freeze": "entity.player.hurt",
+    "block.powder_snow.break": "block.snow.break",
+    "block.powder_snow.fall": "block.snow.fall",
+    "block.powder_snow.hit": "block.snow.hit",
+    "block.powder_snow.place": "block.snow.place",
+    "block.powder_snow.step": "block.snow.step",
+    "block.dripstone_block.break": "block.basalt.break",
+    "block.dripstone_block.step": "block.basalt.step",
+    "block.dripstone_block.place": "block.basalt.place",
+    "block.dripstone_block.hit": "block.basalt.hit",
+    "block.dripstone_block.fall": "block.basalt.fall",
+    "block.pointed_dripstone.break": "block.basalt.break",
+    "block.pointed_dripstone.step": "block.basalt.step",
+    "block.pointed_dripstone.place": "block.basalt.place",
+    "block.pointed_dripstone.hit": "block.basalt.hit",
+    "block.pointed_dripstone.fall": "block.basalt.fall",
+    "block.pointed_dripstone.land": "block.basalt.hit",
+    "block.pointed_dripstone.drip_lava": "block.bubble_column.bubble_pop",
+    "block.pointed_dripstone.drip_water": "block.bubble_column.bubble_pop",
+    "block.pointed_dripstone.drip_lava_into_cauldron": "block.bubble_column.bubble_pop",
+    "block.pointed_dripstone.drip_water_into_cauldron": "block.bubble_column.bubble_pop",
+    "block.sculk_sensor.clicking": "block.chorus_flower.death",
     "block.sculk_sensor.clicking_stop": "",
-    "block.sculk_sensor.break": "",
-    "block.sculk_sensor.fall": "",
-    "block.sculk_sensor.hit": "",
-    "block.sculk_sensor.place": "",
-    "block.sculk_sensor.step": "",
-    "entity.axolotl.attack": "",
-    "entity.axolotl.death": "",
-    "entity.axolotl.hurt": "",
-    "entity.axolotl.idle_air": "",
-    "entity.axolotl.idle_water": "",
-    "entity.axolotl.splash": "",
-    "entity.axolotl.swim": "",
-    "item.bucket.empty_axolotl": "",
-    "item.bucket.fill_axolotl": "",
-    "item.dye.use": "",
-    "item.glow_ink_sac.use": "",
-    "entity.glow_squid.ambient": "",
-    "entity.glow_squid.death": "",
-    "entity.glow_squid.hurt": "",
-    "entity.glow_squid.squirt": "",
-    "item.ink_sac.use": "",
-    "block.azalea.break": "",
-    "block.azalea.fall": "",
-    "block.azalea.hit": "",
-    "block.azalea.place": "",
-    "block.azalea.step": "",
-    "block.azalea_leaves.break": "",
-    "block.azalea_leaves.fall": "",
-    "block.azalea_leaves.hit": "",
-    "block.azalea_leaves.place": "",
-    "block.azalea_leaves.step": "",
-    "block.big_dripleaf.break": "",
-    "block.big_dripleaf.fall": "",
-    "block.big_dripleaf.hit": "",
-    "block.big_dripleaf.place": "",
-    "block.big_dripleaf.step": "",
-    "block.cave_vines.break": "",
-    "block.cave_vines.fall": "",
-    "block.cave_vines.hit": "",
-    "block.cave_vines.place": "",
-    "block.cave_vines.step": "",
-    "block.cave_vines.pick_berries": "",
-    "block.big_dripleaf.tilt_down": "",
-    "block.big_dripleaf.tilt_up": "",
-    "block.flowering_azalea.break": "",
-    "block.flowering_azalea.fall": "",
-    "block.flowering_azalea.hit": "",
-    "block.flowering_azalea.place": "",
-    "block.flowering_azalea.step": "",
-    "block.hanging_roots.break": "",
-    "block.hanging_roots.fall": "",
-    "block.hanging_roots.hit": "",
-    "block.hanging_roots.place": "",
-    "block.hanging_roots.step": "",
-    "block.moss_carpet.break": "",
-    "block.moss_carpet.fall": "",
-    "block.moss_carpet.hit": "",
-    "block.moss_carpet.place": "",
-    "block.moss_carpet.step": "",
-    "block.moss.break": "",
-    "block.moss.fall": "",
-    "block.moss.hit": "",
-    "block.moss.place": "",
-    "block.moss.step": "",
-    "block.rooted_dirt.break": "",
-    "block.rooted_dirt.fall": "",
-    "block.rooted_dirt.hit": "",
-    "block.rooted_dirt.place": "",
-    "block.rooted_dirt.step": "",
-    "entity.skeleton.converted_to_stray": "",
-    "block.small_dripleaf.break": "",
-    "block.small_dripleaf.fall": "",
-    "block.small_dripleaf.hit": "",
-    "block.small_dripleaf.place": "",
-    "block.small_dripleaf.step": "",
-    "block.spore_blossom.break": "",
-    "block.spore_blossom.fall": "",
-    "block.spore_blossom.hit": "",
-    "block.spore_blossom.place": "",
-    "block.spore_blossom.step": "",
-    "block.vine.break": "",
-    "block.vine.fall": "",
-    "block.vine.hit": "",
-    "block.vine.place": "",
-    "block.deepslate_bricks.break": "",
-    "block.deepslate_bricks.fall": "",
-    "block.deepslate_bricks.hit": "",
-    "block.deepslate_bricks.place": "",
-    "block.deepslate_bricks.step": "",
-    "block.deepslate.break": "",
-    "block.deepslate.fall": "",
-    "block.deepslate.hit": "",
-    "block.deepslate.place": "",
-    "block.deepslate.step": "",
-    "block.deepslate_tiles.break": "",
-    "block.deepslate_tiles.fall": "",
-    "block.deepslate_tiles.hit": "",
-    "block.deepslate_tiles.place": "",
-    "block.deepslate_tiles.step": "",
-    "block.polished_deepslate.break": "",
-    "block.polished_deepslate.fall": "",
-    "block.polished_deepslate.hit": "",
-    "block.polished_deepslate.place": "",
-    "block.polished_deepslate.step": "",
-    "entity.glow_item_frame.add_item": "",
-    "entity.glow_item_frame.break": "",
-    "entity.glow_item_frame.place": "",
-    "entity.glow_item_frame.remove_item": "",
-    "entity.glow_item_frame.rotate_item": "",
-    "item.axe.scrape": "",
-    "item.axe.wax_off": "",
-    "item.honeycomb.wax_on": "",
-    "entity.goat.ambient": "",
-    "entity.goat.death": "",
-    "entity.goat.hurt": "",
-    "entity.goat.milk": "",
-    "entity.goat.prepare_ram": "",
-    "entity.goat.screaming.ambient": "",
-    "entity.goat.screaming.death": "",
-    "entity.goat.screaming.hurt": "",
-    "entity.goat.screaming.milk": "",
+    "block.sculk_sensor.break": "block.stem.break",
+    "block.sculk_sensor.fall": "block.stem.fall",
+    "block.sculk_sensor.hit": "block.stem.hit",
+    "block.sculk_sensor.place": "block.stem.hit",
+    "block.sculk_sensor.step": "block.stem.step",
+    "entity.axolotl.attack": "entity.fox.hurt",
+    "entity.axolotl.death": "entity.fox.death",
+    "entity.axolotl.hurt": "entity.fox.hurt",
+    "entity.axolotl.idle_air": "entity.elder_guardian.ambient_land",
+    "entity.axolotl.idle_water": "block.bubble_column.bubble_pop",
+    "entity.axolotl.splash": "entity.generic.splash",
+    "entity.axolotl.swim": "entity.generic.swim",
+    "item.bucket.empty_axolotl": "item.bucket.empty",
+    "item.bucket.fill_axolotl": "item.bucket.fill",
+    "item.dye.use": "block.snow.fall",
+    "item.glow_ink_sac.use": "block.beehive.drip",
+    "entity.glow_squid.ambient": "entity.squid.ambient",
+    "entity.glow_squid.death": "entity.squid.death",
+    "entity.glow_squid.hurt": "entity.squid.hurt",
+    "entity.glow_squid.squirt": "entity.squid.squirt",
+    "item.ink_sac.use": "block.beehive.drip",
+    "block.azalea.break": "block.grass.break",
+    "block.azalea.fall": "block.grass.fall",
+    "block.azalea.hit": "block.grass.hit",
+    "block.azalea.place": "block.grass.place",
+    "block.azalea.step": "block.grass.step",
+    "block.azalea_leaves.break": "block.grass.break",
+    "block.azalea_leaves.fall": "block.grass.fall",
+    "block.azalea_leaves.hit": "block.grass.hit",
+    "block.azalea_leaves.place": "block.grass.place",
+    "block.azalea_leaves.step": "block.grass.step",
+    "block.big_dripleaf.break": "block.grass.break",
+    "block.big_dripleaf.fall": "block.grass.fall",
+    "block.big_dripleaf.hit": "block.grass.hit",
+    "block.big_dripleaf.place": "block.grass.place",
+    "block.big_dripleaf.step": "block.grass.step",
+    "block.cave_vines.break": "block.grass.break",
+    "block.cave_vines.fall": "block.grass.fall",
+    "block.cave_vines.hit": "block.grass.hit",
+    "block.cave_vines.place": "block.grass.place",
+    "block.cave_vines.step": "block.grass.step",
+    "block.cave_vines.pick_berries": "block.sweet_berry_bush.place",
+    "block.big_dripleaf.tilt_down": "block.grass.step",
+    "block.big_dripleaf.tilt_up": "block.grass.step",
+    "block.flowering_azalea.break": "block.grass.break",
+    "block.flowering_azalea.fall": "block.grass.fall",
+    "block.flowering_azalea.hit": "block.grass.hit",
+    "block.flowering_azalea.place": "block.grass.place",
+    "block.flowering_azalea.step": "block.grass.step",
+    "block.hanging_roots.break": "block.wet_grass.break",
+    "block.hanging_roots.fall": "block.wet_grass.fall",
+    "block.hanging_roots.hit": "block.wet_grass.hit",
+    "block.hanging_roots.place": "block.wet_grass.place",
+    "block.hanging_roots.step": "block.wet_grass.step",
+    "block.moss_carpet.break": "block.grass.break",
+    "block.moss_carpet.fall": "block.grass.fall",
+    "block.moss_carpet.hit": "block.grass.hit",
+    "block.moss_carpet.place": "block.grass.place",
+    "block.moss_carpet.step": "block.grass.step",
+    "block.moss.break": "block.grass.break",
+    "block.moss.fall": "block.grass.fall",
+    "block.moss.hit": "block.grass.hit",
+    "block.moss.place": "block.grass.place",
+    "block.moss.step": "block.grass.step",
+    "block.rooted_dirt.break": "block.grass.break",
+    "block.rooted_dirt.fall": "block.grass.fall",
+    "block.rooted_dirt.hit": "block.grass.hit",
+    "block.rooted_dirt.place": "block.grass.place",
+    "block.rooted_dirt.step": "block.grass.step",
+    "entity.skeleton.converted_to_stray": "block.glass.break",
+    "block.small_dripleaf.break": "block.grass.break",
+    "block.small_dripleaf.fall": "block.grass.fall",
+    "block.small_dripleaf.hit": "block.grass.hit",
+    "block.small_dripleaf.place": "block.grass.place",
+    "block.small_dripleaf.step": "block.grass.step",
+    "block.spore_blossom.break": "block.grass.break",
+    "block.spore_blossom.fall": "block.grass.fall",
+    "block.spore_blossom.hit": "block.grass.hit",
+    "block.spore_blossom.place": "block.grass.place",
+    "block.spore_blossom.step": "block.grass.place",
+    "block.vine.break": "block.grass.break",
+    "block.vine.fall": "block.grass.fall",
+    "block.vine.hit": "block.grass.hit",
+    "block.vine.place": "block.grass.place",
+    "block.deepslate_bricks.break": "block.basalt.break",
+    "block.deepslate_bricks.fall": "block.basalt.fall",
+    "block.deepslate_bricks.hit": "block.basalt.hit",
+    "block.deepslate_bricks.place": "block.basalt.place",
+    "block.deepslate_bricks.step": "block.basalt.step",
+    "block.deepslate.break": "block.basalt.break",
+    "block.deepslate.fall": "block.basalt.fall",
+    "block.deepslate.hit": "block.basalt.hit",
+    "block.deepslate.place": "block.basalt.place",
+    "block.deepslate.step": "block.basalt.step",
+    "block.deepslate_tiles.break": "block.basalt.break",
+    "block.deepslate_tiles.fall": "block.basalt.fall",
+    "block.deepslate_tiles.hit": "block.basalt.hit",
+    "block.deepslate_tiles.place": "block.basalt.place",
+    "block.deepslate_tiles.step": "block.basalt.step",
+    "block.polished_deepslate.break": "block.basalt.break",
+    "block.polished_deepslate.fall": "block.basalt.fall",
+    "block.polished_deepslate.hit": "block.basalt.hit",
+    "block.polished_deepslate.place": "block.basalt.place",
+    "block.polished_deepslate.step": "block.basalt.step",
+    "entity.glow_item_frame.add_item": "entity.item_frame.add_item",
+    "entity.glow_item_frame.break": "entity.item_frame.break",
+    "entity.glow_item_frame.place": "entity.item_frame.place",
+    "entity.glow_item_frame.remove_item": "entity.item_frame.remove_item",
+    "entity.glow_item_frame.rotate_item": "entity.item_frame.rotate_item",
+    "item.axe.scrape": "item.axe.strip",
+    "item.axe.wax_off": "item.axe.strip",
+    "item.honeycomb.wax_on": "block.honey_block.slide",
+    "entity.goat.ambient": "entity.sheep.ambient",
+    "entity.goat.death": "entity.sheep.death",
+    "entity.goat.hurt": "entity.sheep.hurt",
+    "entity.goat.milk": "entity.cow.milk",
+    "entity.goat.prepare_ram": "entity.sheep.ambient",
+    "entity.goat.screaming.ambient": "entity.fox.screech",
+    "entity.goat.screaming.death": "entity.sheep.death",
+    "entity.goat.screaming.hurt": "entity.sheep.hurt",
+    "entity.goat.screaming.milk": "entity.cow.milk",
     "entity.goat.screaming.ram": "",
-    "entity.goat.step": "",
-    "item.bone_meal.use": "",
-    "entity.goat.eat": "",
-    "entity.goat.long_jump": "",
-    "entity.goat.ram_impact": "",
-    "entity.goat.screaming.eat": "",
-    "entity.goat.screaming.long_jump": "",
-    "entity.goat.screaming.prepare_ram": "",
-    "entity.goat.screaming.ram_impact": "",
+    "entity.goat.step": "entity.sheep.step",
+    "item.bone_meal.use": "block.wet_grass.step",
+    "entity.goat.eat": "entity.fox.eat",
+    "entity.goat.long_jump": "entity.snowball.throw",
+    "entity.goat.ram_impact": "block.basalt.break",
+    "entity.goat.screaming.eat": "entity.fox.eat",
+    "entity.goat.screaming.long_jump": "entity.snowball.throw",
+    "entity.goat.screaming.prepare_ram": "entity.fox.screech",
+    "entity.goat.screaming.ram_impact": "block.basalt.break",
     "block.sweet_berry_bush.pick_berries": "item.sweet_berries.pick_from_bush"
   },
   "particles": {
@@ -1416,4 +1416,4 @@
     "goat": "Goat",
     "glow_squid": "Glow Squid"
   }
-}
\ No newline at end of file
+}