diff --git a/mappings/net/minecraft/reference/Sounds.mapping b/mappings/net/minecraft/reference/Sounds.mapping
index 845c04e054..851e4f5a68 100644
--- a/mappings/net/minecraft/reference/Sounds.mapping
+++ b/mappings/net/minecraft/reference/Sounds.mapping
@@ -1,4 +1,30 @@
 CLASS none/nl net/minecraft/reference/Sounds
+		FIELD a AMBIENT_CAVE Lnone/nk;
+	FIELD b BLOCK_ANVIL_BREAK Lnone/nk;
+	FIELD c BLOCK_ANVIL_DESTROY Lnone/nk;
+	FIELD d BLOCK_ANVIL_FALL Lnone/nk;
+	FIELD e BLOCK_ANVIL_HIT Lnone/nk;
+	FIELD f BLOCK_ANVIL_LAND Lnone/nk;
+	FIELD g BLOCK_ANVIL_PLACE Lnone/nk;
+	FIELD h BLOCK_ANVIL_STEP Lnone/nk;
+	FIELD i BLOCK_ANVIL_USE Lnone/nk;
+	FIELD j ENTITY_ARMORSTAND_BREAK Lnone/nk;
+	FIELD k ENTITY_ARMORSTAND_FALL Lnone/nk;
+	FIELD l ENTITY_ARMORSTAND_HIT Lnone/nk;
+	FIELD m ENTITY_ARMORSTAND_PLACE Lnone/nk;
+	FIELD n ITEM_ARMOR_EQUIP_CHAIN Lnone/nk;
+	FIELD o ITEM_ARMOR_EQUIP_DIAMOND Lnone/nk;
+	FIELD p ITEM_ARMOR_EQUIP_GENERIC Lnone/nk;
+	FIELD q ITEM_ARMOR_EQUIP_GOLD Lnone/nk;
+	FIELD r ITEM_ARMOR_EQUIP_IRON Lnone/nk;
+	FIELD s ITEM_ARMOR_EQUIP_LEATHER Lnone/nk;
+	FIELD t ENTITY_ARROW_HIT Lnone/nk;
+	FIELD u ENTITY_ARROW_HIT_PLAYER Lnone/nk;
+	FIELD v ENTITY_ARROW_SHOOT Lnone/nk;
+	FIELD w ENTITY_BAT_AMBIENT Lnone/nk;
+	FIELD x ENTITY_BAT_DEATH Lnone/nk;
+	FIELD y ENTITY_BAT_HURT Lnone/nk;
+	FIELD z ENTITY_BAT_LOOP Lnone/nk;
 	FIELD A ENTITY_BAT_TAKEOFF Lnone/nk;
 	FIELD B ENTITY_BLAZE_AMBIENT Lnone/nk;
 	FIELD C ENTITY_BLAZE_BURN Lnone/nk;
@@ -25,33 +51,6 @@ CLASS none/nl net/minecraft/reference/Sounds
 	FIELD X BLOCK_CHEST_LOCKED Lnone/nk;
 	FIELD Y BLOCK_CHEST_OPEN Lnone/nk;
 	FIELD Z ENTITY_CHICKEN_AMBIENT Lnone/nk;
-	FIELD aA ENTITY_DONKEY_CHEST Lnone/nk;
-	FIELD aB ENTITY_DONKEY_DEATH Lnone/nk;
-	FIELD aC ENTITY_DONKEY_HURT Lnone/nk;
-	FIELD aD ENTITY_EGG_THROW Lnone/nk;
-	FIELD aE ENTITY_ELDER_GUARDIAN_AMBIENT Lnone/nk;
-	FIELD aF ENTITY_ELDER_GUARDIAN_AMBIENT_LAND Lnone/nk;
-	FIELD aG ENTITY_ELDER_GUARDIAN_CURSE Lnone/nk;
-	FIELD aH ENTITY_ELDER_GUARDIAN_DEATH Lnone/nk;
-	FIELD aI ENTITY_ELDER_GUARDIAN_DEATH_LAND Lnone/nk;
-	FIELD aJ ENTITY_ELDER_GUARDIAN_HURT Lnone/nk;
-	FIELD aK ENTITY_ELDER_GUARDIAN_HURT_LAND Lnone/nk;
-	FIELD aL ITEM_ELYTRA_FLYING Lnone/nk;
-	FIELD a AMBIENT_CAVE Lnone/nk;
-	FIELD aM BLOCK_ENCHANTMENT_TABLE_USE Lnone/nk;
-	FIELD aN BLOCK_ENDERCHEST_CLOSE Lnone/nk;
-	FIELD aO BLOCK_ENDERCHEST_OPEN Lnone/nk;
-	FIELD aP ENTITY_ENDERDRAGON_AMBIENT Lnone/nk;
-	FIELD aQ ENTITY_ENDERDRAGON_DEATH Lnone/nk;
-	FIELD aR ENTITY_ENDERDRAGON_FIREBALL_EXPLODE Lnone/nk;
-	FIELD aS ENTITY_ENDERDRAGON_FLAP Lnone/nk;
-	FIELD aT ENTITY_ENDERDRAGON_GROWL Lnone/nk;
-	FIELD aU ENTITY_ENDERDRAGON_HURT Lnone/nk;
-	FIELD aV ENTITY_ENDERDRAGON_SHOOT Lnone/nk;
-	FIELD aW ENTITY_ENDEREYE_LAUNCH Lnone/nk;
-	FIELD aX ENTITY_ENDERMEN_AMBIENT Lnone/nk;
-	FIELD aY ENTITY_ENDERMEN_DEATH Lnone/nk;
-	FIELD aZ ENTITY_ENDERMEN_HURT Lnone/nk;
 	FIELD aa ENTITY_CHICKEN_DEATH Lnone/nk;
 	FIELD ab ENTITY_CHICKEN_EGG Lnone/nk;
 	FIELD ac ENTITY_CHICKEN_HURT Lnone/nk;
@@ -78,33 +77,32 @@ CLASS none/nl net/minecraft/reference/Sounds
 	FIELD ax BLOCK_DISPENSER_LAUNCH Lnone/nk;
 	FIELD ay ENTITY_DONKEY_AMBIENT Lnone/nk;
 	FIELD az ENTITY_DONKEY_ANGRY Lnone/nk;
-	FIELD bA BLOCK_FURNACE_FIRE_CRACKLE Lnone/nk;
-	FIELD bB ENTITY_GENERIC_BIG_FALL Lnone/nk;
-	FIELD bC ENTITY_GENERIC_BURN Lnone/nk;
-	FIELD bD ENTITY_GENERIC_DEATH Lnone/nk;
-	FIELD bE ENTITY_GENERIC_DRINK Lnone/nk;
-	FIELD bF ENTITY_GENERIC_EAT Lnone/nk;
-	FIELD bG ENTITY_GENERIC_EXPLODE Lnone/nk;
-	FIELD bH ENTITY_GENERIC_EXTINGUISH_FIRE Lnone/nk;
-	FIELD bI ENTITY_GENERIC_HURT Lnone/nk;
-	FIELD bJ ENTITY_GENERIC_SMALL_FALL Lnone/nk;
-	FIELD bK ENTITY_GENERIC_SPLASH Lnone/nk;
-	FIELD bL ENTITY_GENERIC_SWIM Lnone/nk;
-	FIELD b BLOCK_ANVIL_BREAK Lnone/nk;
-	FIELD bM ENTITY_GHAST_AMBIENT Lnone/nk;
-	FIELD bN ENTITY_GHAST_DEATH Lnone/nk;
-	FIELD bO ENTITY_GHAST_HURT Lnone/nk;
-	FIELD bP ENTITY_GHAST_SCREAM Lnone/nk;
-	FIELD bQ ENTITY_GHAST_SHOOT Lnone/nk;
-	FIELD bR ENTITY_GHAST_WARN Lnone/nk;
-	FIELD bS BLOCK_GLASS_BREAK Lnone/nk;
-	FIELD bT BLOCK_GLASS_FALL Lnone/nk;
-	FIELD bU BLOCK_GLASS_HIT Lnone/nk;
-	FIELD bV BLOCK_GLASS_PLACE Lnone/nk;
-	FIELD bW BLOCK_GLASS_STEP Lnone/nk;
-	FIELD bX BLOCK_GRASS_BREAK Lnone/nk;
-	FIELD bY BLOCK_GRASS_FALL Lnone/nk;
-	FIELD bZ BLOCK_GRASS_HIT Lnone/nk;
+	FIELD aA ENTITY_DONKEY_CHEST Lnone/nk;
+	FIELD aB ENTITY_DONKEY_DEATH Lnone/nk;
+	FIELD aC ENTITY_DONKEY_HURT Lnone/nk;
+	FIELD aD ENTITY_EGG_THROW Lnone/nk;
+	FIELD aE ENTITY_ELDER_GUARDIAN_AMBIENT Lnone/nk;
+	FIELD aF ENTITY_ELDER_GUARDIAN_AMBIENT_LAND Lnone/nk;
+	FIELD aG ENTITY_ELDER_GUARDIAN_CURSE Lnone/nk;
+	FIELD aH ENTITY_ELDER_GUARDIAN_DEATH Lnone/nk;
+	FIELD aI ENTITY_ELDER_GUARDIAN_DEATH_LAND Lnone/nk;
+	FIELD aJ ENTITY_ELDER_GUARDIAN_HURT Lnone/nk;
+	FIELD aK ENTITY_ELDER_GUARDIAN_HURT_LAND Lnone/nk;
+	FIELD aL ITEM_ELYTRA_FLYING Lnone/nk;
+	FIELD aM BLOCK_ENCHANTMENT_TABLE_USE Lnone/nk;
+	FIELD aN BLOCK_ENDERCHEST_CLOSE Lnone/nk;
+	FIELD aO BLOCK_ENDERCHEST_OPEN Lnone/nk;
+	FIELD aP ENTITY_ENDERDRAGON_AMBIENT Lnone/nk;
+	FIELD aQ ENTITY_ENDERDRAGON_DEATH Lnone/nk;
+	FIELD aR ENTITY_ENDERDRAGON_FIREBALL_EXPLODE Lnone/nk;
+	FIELD aS ENTITY_ENDERDRAGON_FLAP Lnone/nk;
+	FIELD aT ENTITY_ENDERDRAGON_GROWL Lnone/nk;
+	FIELD aU ENTITY_ENDERDRAGON_HURT Lnone/nk;
+	FIELD aV ENTITY_ENDERDRAGON_SHOOT Lnone/nk;
+	FIELD aW ENTITY_ENDEREYE_LAUNCH Lnone/nk;
+	FIELD aX ENTITY_ENDERMEN_AMBIENT Lnone/nk;
+	FIELD aY ENTITY_ENDERMEN_DEATH Lnone/nk;
+	FIELD aZ ENTITY_ENDERMEN_HURT Lnone/nk;
 	FIELD ba ENTITY_ENDERMEN_SCREAM Lnone/nk;
 	FIELD bb ENTITY_ENDERMEN_STARE Lnone/nk;
 	FIELD bc ENTITY_ENDERMEN_TELEPORT Lnone/nk;
@@ -131,33 +129,32 @@ CLASS none/nl net/minecraft/reference/Sounds
 	FIELD bx BLOCK_FIRE_AMBIENT Lnone/nk;
 	FIELD by BLOCK_FIRE_EXTINGUISH Lnone/nk;
 	FIELD bz ITEM_FLINTANDSTEEL_USE Lnone/nk;
-	FIELD cA ENTITY_HORSE_SADDLE Lnone/nk;
-	FIELD cB ENTITY_HORSE_STEP Lnone/nk;
-	FIELD cC ENTITY_HORSE_STEP_WOOD Lnone/nk;
-	FIELD cD ENTITY_HOSTILE_BIG_FALL Lnone/nk;
-	FIELD cE ENTITY_HOSTILE_DEATH Lnone/nk;
-	FIELD cF ENTITY_HOSTILE_HURT Lnone/nk;
-	FIELD cG ENTITY_HOSTILE_SMALL_FALL Lnone/nk;
-	FIELD cH ENTITY_HOSTILE_SPLASH Lnone/nk;
-	FIELD cI ENTITY_HOSTILE_SWIM Lnone/nk;
-	FIELD cJ ENTITY_HUSK_AMBIENT Lnone/nk;
-	FIELD cK ENTITY_HUSK_DEATH Lnone/nk;
-	FIELD cL ENTITY_HUSK_HURT Lnone/nk;
-	FIELD c BLOCK_ANVIL_DESTROY Lnone/nk;
-	FIELD cM ENTITY_HUSK_STEP Lnone/nk;
-	FIELD cN ENTITY_IRONGOLEM_ATTACK Lnone/nk;
-	FIELD cO ENTITY_IRONGOLEM_DEATH Lnone/nk;
-	FIELD cP ENTITY_IRONGOLEM_HURT Lnone/nk;
-	FIELD cQ ENTITY_IRONGOLEM_STEP Lnone/nk;
-	FIELD cR BLOCK_IRON_DOOR_CLOSE Lnone/nk;
-	FIELD cS BLOCK_IRON_DOOR_OPEN Lnone/nk;
-	FIELD cT BLOCK_IRON_TRAPDOOR_CLOSE Lnone/nk;
-	FIELD cU BLOCK_IRON_TRAPDOOR_OPEN Lnone/nk;
-	FIELD cV ENTITY_ITEMFRAME_ADD_ITEM Lnone/nk;
-	FIELD cW ENTITY_ITEMFRAME_BREAK Lnone/nk;
-	FIELD cX ENTITY_ITEMFRAME_PLACE Lnone/nk;
-	FIELD cY ENTITY_ITEMFRAME_REMOVE_ITEM Lnone/nk;
-	FIELD cZ ENTITY_ITEMFRAME_ROTATE_ITEM Lnone/nk;
+	FIELD bA BLOCK_FURNACE_FIRE_CRACKLE Lnone/nk;
+	FIELD bB ENTITY_GENERIC_BIG_FALL Lnone/nk;
+	FIELD bC ENTITY_GENERIC_BURN Lnone/nk;
+	FIELD bD ENTITY_GENERIC_DEATH Lnone/nk;
+	FIELD bE ENTITY_GENERIC_DRINK Lnone/nk;
+	FIELD bF ENTITY_GENERIC_EAT Lnone/nk;
+	FIELD bG ENTITY_GENERIC_EXPLODE Lnone/nk;
+	FIELD bH ENTITY_GENERIC_EXTINGUISH_FIRE Lnone/nk;
+	FIELD bI ENTITY_GENERIC_HURT Lnone/nk;
+	FIELD bJ ENTITY_GENERIC_SMALL_FALL Lnone/nk;
+	FIELD bK ENTITY_GENERIC_SPLASH Lnone/nk;
+	FIELD bL ENTITY_GENERIC_SWIM Lnone/nk;
+	FIELD bM ENTITY_GHAST_AMBIENT Lnone/nk;
+	FIELD bN ENTITY_GHAST_DEATH Lnone/nk;
+	FIELD bO ENTITY_GHAST_HURT Lnone/nk;
+	FIELD bP ENTITY_GHAST_SCREAM Lnone/nk;
+	FIELD bQ ENTITY_GHAST_SHOOT Lnone/nk;
+	FIELD bR ENTITY_GHAST_WARN Lnone/nk;
+	FIELD bS BLOCK_GLASS_BREAK Lnone/nk;
+	FIELD bT BLOCK_GLASS_FALL Lnone/nk;
+	FIELD bU BLOCK_GLASS_HIT Lnone/nk;
+	FIELD bV BLOCK_GLASS_PLACE Lnone/nk;
+	FIELD bW BLOCK_GLASS_STEP Lnone/nk;
+	FIELD bX BLOCK_GRASS_BREAK Lnone/nk;
+	FIELD bY BLOCK_GRASS_FALL Lnone/nk;
+	FIELD bZ BLOCK_GRASS_HIT Lnone/nk;
 	FIELD ca BLOCK_GRASS_PLACE Lnone/nk;
 	FIELD cb BLOCK_GRASS_STEP Lnone/nk;
 	FIELD cc BLOCK_GRAVEL_BREAK Lnone/nk;
@@ -184,33 +181,32 @@ CLASS none/nl net/minecraft/reference/Sounds
 	FIELD cx ENTITY_HORSE_HURT Lnone/nk;
 	FIELD cy ENTITY_HORSE_JUMP Lnone/nk;
 	FIELD cz ENTITY_HORSE_LAND Lnone/nk;
-	FIELD dA BLOCK_METAL_STEP Lnone/nk;
-	FIELD dB ENTITY_MINECART_INSIDE Lnone/nk;
-	FIELD dC ENTITY_MINECART_RIDING Lnone/nk;
-	FIELD dD ENTITY_MOOSHROOM_SHEAR Lnone/nk;
-	FIELD dE ENTITY_MULE_AMBIENT Lnone/nk;
-	FIELD dF ENTITY_MULE_DEATH Lnone/nk;
-	FIELD dG ENTITY_MULE_HURT Lnone/nk;
-	FIELD dH MUSIC_CREATIVE Lnone/nk;
-	FIELD dI MUSIC_CREDITS Lnone/nk;
-	FIELD dJ MUSIC_DRAGON Lnone/nk;
-	FIELD dK MUSIC_END Lnone/nk;
-	FIELD dL MUSIC_GAME Lnone/nk;
-	FIELD d BLOCK_ANVIL_FALL Lnone/nk;
-	FIELD dM MUSIC_MENU Lnone/nk;
-	FIELD dN MUSIC_NETHER Lnone/nk;
-	FIELD dO BLOCK_NOTE_BASEDRUM Lnone/nk;
-	FIELD dP BLOCK_NOTE_BASS Lnone/nk;
-	FIELD dQ BLOCK_NOTE_HARP Lnone/nk;
-	FIELD dR BLOCK_NOTE_HAT Lnone/nk;
-	FIELD dS BLOCK_NOTE_PLING Lnone/nk;
-	FIELD dT BLOCK_NOTE_SNARE Lnone/nk;
-	FIELD dU ENTITY_PAINTING_BREAK Lnone/nk;
-	FIELD dV ENTITY_PAINTING_PLACE Lnone/nk;
-	FIELD dW ENTITY_PIG_AMBIENT Lnone/nk;
-	FIELD dX ENTITY_PIG_DEATH Lnone/nk;
-	FIELD dY ENTITY_PIG_HURT Lnone/nk;
-	FIELD dZ ENTITY_PIG_SADDLE Lnone/nk;
+	FIELD cA ENTITY_HORSE_SADDLE Lnone/nk;
+	FIELD cB ENTITY_HORSE_STEP Lnone/nk;
+	FIELD cC ENTITY_HORSE_STEP_WOOD Lnone/nk;
+	FIELD cD ENTITY_HOSTILE_BIG_FALL Lnone/nk;
+	FIELD cE ENTITY_HOSTILE_DEATH Lnone/nk;
+	FIELD cF ENTITY_HOSTILE_HURT Lnone/nk;
+	FIELD cG ENTITY_HOSTILE_SMALL_FALL Lnone/nk;
+	FIELD cH ENTITY_HOSTILE_SPLASH Lnone/nk;
+	FIELD cI ENTITY_HOSTILE_SWIM Lnone/nk;
+	FIELD cJ ENTITY_HUSK_AMBIENT Lnone/nk;
+	FIELD cK ENTITY_HUSK_DEATH Lnone/nk;
+	FIELD cL ENTITY_HUSK_HURT Lnone/nk;
+	FIELD cM ENTITY_HUSK_STEP Lnone/nk;
+	FIELD cN ENTITY_IRONGOLEM_ATTACK Lnone/nk;
+	FIELD cO ENTITY_IRONGOLEM_DEATH Lnone/nk;
+	FIELD cP ENTITY_IRONGOLEM_HURT Lnone/nk;
+	FIELD cQ ENTITY_IRONGOLEM_STEP Lnone/nk;
+	FIELD cR BLOCK_IRON_DOOR_CLOSE Lnone/nk;
+	FIELD cS BLOCK_IRON_DOOR_OPEN Lnone/nk;
+	FIELD cT BLOCK_IRON_TRAPDOOR_CLOSE Lnone/nk;
+	FIELD cU BLOCK_IRON_TRAPDOOR_OPEN Lnone/nk;
+	FIELD cV ENTITY_ITEMFRAME_ADD_ITEM Lnone/nk;
+	FIELD cW ENTITY_ITEMFRAME_BREAK Lnone/nk;
+	FIELD cX ENTITY_ITEMFRAME_PLACE Lnone/nk;
+	FIELD cY ENTITY_ITEMFRAME_REMOVE_ITEM Lnone/nk;
+	FIELD cZ ENTITY_ITEMFRAME_ROTATE_ITEM Lnone/nk;
 	FIELD da ENTITY_ITEM_BREAK Lnone/nk;
 	FIELD db ENTITY_ITEM_PICKUP Lnone/nk;
 	FIELD dc BLOCK_LADDER_BREAK Lnone/nk;
@@ -225,6 +221,7 @@ CLASS none/nl net/minecraft/reference/Sounds
 	FIELD dl ENTITY_LEASHKNOT_PLACE Lnone/nk;
 	FIELD dm BLOCK_LEVER_CLICK Lnone/nk;
 	FIELD dn ENTITY_LIGHTNING_IMPACT Lnone/nk;
+	FIELD jdField_do ENTITY_LIGHTNING_THUNDER Lnone/nk;
 	FIELD dp ENTITY_LINGERINGPOTION_THROW Lnone/nk;
 	FIELD dq ENTITY_MAGMACUBE_DEATH Lnone/nk;
 	FIELD dr ENTITY_MAGMACUBE_HURT Lnone/nk;
@@ -236,33 +233,32 @@ CLASS none/nl net/minecraft/reference/Sounds
 	FIELD dx BLOCK_METAL_PLACE Lnone/nk;
 	FIELD dy BLOCK_METAL_PRESSUREPLATE_CLICK_OFF Lnone/nk;
 	FIELD dz BLOCK_METAL_PRESSUREPLATE_CLICK_ON Lnone/nk;
-	FIELD eA BLOCK_PORTAL_TRIGGER Lnone/nk;
-	FIELD eB ENTITY_RABBIT_AMBIENT Lnone/nk;
-	FIELD eC ENTITY_RABBIT_ATTACK Lnone/nk;
-	FIELD eD ENTITY_RABBIT_DEATH Lnone/nk;
-	FIELD eE ENTITY_RABBIT_HURT Lnone/nk;
-	FIELD eF ENTITY_RABBIT_JUMP Lnone/nk;
-	FIELD eG RECORD_11 Lnone/nk;
-	FIELD eH RECORD_13 Lnone/nk;
-	FIELD eI RECORD_BLOCKS Lnone/nk;
-	FIELD eJ RECORD_CAT Lnone/nk;
-	FIELD eK RECORD_CHIRP Lnone/nk;
-	FIELD eL RECORD_FAR Lnone/nk;
-	FIELD e BLOCK_ANVIL_HIT Lnone/nk;
-	FIELD eM RECORD_MALL Lnone/nk;
-	FIELD eN RECORD_MELLOHI Lnone/nk;
-	FIELD eO RECORD_STAL Lnone/nk;
-	FIELD eP RECORD_STRAD Lnone/nk;
-	FIELD eQ RECORD_WAIT Lnone/nk;
-	FIELD eR RECORD_WARD Lnone/nk;
-	FIELD eS BLOCK_REDSTONE_TORCH_BURNOUT Lnone/nk;
-	FIELD eT BLOCK_SAND_BREAK Lnone/nk;
-	FIELD eU BLOCK_SAND_FALL Lnone/nk;
-	FIELD eV BLOCK_SAND_HIT Lnone/nk;
-	FIELD eW BLOCK_SAND_PLACE Lnone/nk;
-	FIELD eX BLOCK_SAND_STEP Lnone/nk;
-	FIELD eY ENTITY_SHEEP_AMBIENT Lnone/nk;
-	FIELD eZ ENTITY_SHEEP_DEATH Lnone/nk;
+	FIELD dA BLOCK_METAL_STEP Lnone/nk;
+	FIELD dB ENTITY_MINECART_INSIDE Lnone/nk;
+	FIELD dC ENTITY_MINECART_RIDING Lnone/nk;
+	FIELD dD ENTITY_MOOSHROOM_SHEAR Lnone/nk;
+	FIELD dE ENTITY_MULE_AMBIENT Lnone/nk;
+	FIELD dF ENTITY_MULE_DEATH Lnone/nk;
+	FIELD dG ENTITY_MULE_HURT Lnone/nk;
+	FIELD dH MUSIC_CREATIVE Lnone/nk;
+	FIELD dI MUSIC_CREDITS Lnone/nk;
+	FIELD dJ MUSIC_DRAGON Lnone/nk;
+	FIELD dK MUSIC_END Lnone/nk;
+	FIELD dL MUSIC_GAME Lnone/nk;
+	FIELD dM MUSIC_MENU Lnone/nk;
+	FIELD dN MUSIC_NETHER Lnone/nk;
+	FIELD dO BLOCK_NOTE_BASEDRUM Lnone/nk;
+	FIELD dP BLOCK_NOTE_BASS Lnone/nk;
+	FIELD dQ BLOCK_NOTE_HARP Lnone/nk;
+	FIELD dR BLOCK_NOTE_HAT Lnone/nk;
+	FIELD dS BLOCK_NOTE_PLING Lnone/nk;
+	FIELD dT BLOCK_NOTE_SNARE Lnone/nk;
+	FIELD dU ENTITY_PAINTING_BREAK Lnone/nk;
+	FIELD dV ENTITY_PAINTING_PLACE Lnone/nk;
+	FIELD dW ENTITY_PIG_AMBIENT Lnone/nk;
+	FIELD dX ENTITY_PIG_DEATH Lnone/nk;
+	FIELD dY ENTITY_PIG_HURT Lnone/nk;
+	FIELD dZ ENTITY_PIG_SADDLE Lnone/nk;
 	FIELD ea ENTITY_PIG_STEP Lnone/nk;
 	FIELD eb BLOCK_PISTON_CONTRACT Lnone/nk;
 	FIELD ec BLOCK_PISTON_EXTEND Lnone/nk;
@@ -289,33 +285,32 @@ CLASS none/nl net/minecraft/reference/Sounds
 	FIELD ex ENTITY_POLAR_BEAR_WARNING Lnone/nk;
 	FIELD ey BLOCK_PORTAL_AMBIENT Lnone/nk;
 	FIELD ez BLOCK_PORTAL_TRAVEL Lnone/nk;
-	FIELD fA ENTITY_SKELETON_SHOOT Lnone/nk;
-	FIELD fB ENTITY_SKELETON_STEP Lnone/nk;
-	FIELD fC ENTITY_SLIME_ATTACK Lnone/nk;
-	FIELD fD BLOCK_SLIME_BREAK Lnone/nk;
-	FIELD fE ENTITY_SLIME_DEATH Lnone/nk;
-	FIELD fF BLOCK_SLIME_FALL Lnone/nk;
-	FIELD fG BLOCK_SLIME_HIT Lnone/nk;
-	FIELD fH ENTITY_SLIME_HURT Lnone/nk;
-	FIELD fI ENTITY_SLIME_JUMP Lnone/nk;
-	FIELD fJ BLOCK_SLIME_PLACE Lnone/nk;
-	FIELD fK ENTITY_SLIME_SQUISH Lnone/nk;
-	FIELD fL BLOCK_SLIME_STEP Lnone/nk;
-	FIELD f BLOCK_ANVIL_LAND Lnone/nk;
-	FIELD fM ENTITY_SMALL_MAGMACUBE_DEATH Lnone/nk;
-	FIELD fN ENTITY_SMALL_MAGMACUBE_HURT Lnone/nk;
-	FIELD fO ENTITY_SMALL_MAGMACUBE_SQUISH Lnone/nk;
-	FIELD fP ENTITY_SMALL_SLIME_DEATH Lnone/nk;
-	FIELD fQ ENTITY_SMALL_SLIME_HURT Lnone/nk;
-	FIELD fR ENTITY_SMALL_SLIME_JUMP Lnone/nk;
-	FIELD fS ENTITY_SMALL_SLIME_SQUISH Lnone/nk;
-	FIELD fT ENTITY_SNOWBALL_THROW Lnone/nk;
-	FIELD fU ENTITY_SNOWMAN_AMBIENT Lnone/nk;
-	FIELD fV ENTITY_SNOWMAN_DEATH Lnone/nk;
-	FIELD fW ENTITY_SNOWMAN_HURT Lnone/nk;
-	FIELD fX ENTITY_SNOWMAN_SHOOT Lnone/nk;
-	FIELD fY BLOCK_SNOW_BREAK Lnone/nk;
-	FIELD fZ BLOCK_SNOW_FALL Lnone/nk;
+	FIELD eA BLOCK_PORTAL_TRIGGER Lnone/nk;
+	FIELD eB ENTITY_RABBIT_AMBIENT Lnone/nk;
+	FIELD eC ENTITY_RABBIT_ATTACK Lnone/nk;
+	FIELD eD ENTITY_RABBIT_DEATH Lnone/nk;
+	FIELD eE ENTITY_RABBIT_HURT Lnone/nk;
+	FIELD eF ENTITY_RABBIT_JUMP Lnone/nk;
+	FIELD eG RECORD_11 Lnone/nk;
+	FIELD eH RECORD_13 Lnone/nk;
+	FIELD eI RECORD_BLOCKS Lnone/nk;
+	FIELD eJ RECORD_CAT Lnone/nk;
+	FIELD eK RECORD_CHIRP Lnone/nk;
+	FIELD eL RECORD_FAR Lnone/nk;
+	FIELD eM RECORD_MALL Lnone/nk;
+	FIELD eN RECORD_MELLOHI Lnone/nk;
+	FIELD eO RECORD_STAL Lnone/nk;
+	FIELD eP RECORD_STRAD Lnone/nk;
+	FIELD eQ RECORD_WAIT Lnone/nk;
+	FIELD eR RECORD_WARD Lnone/nk;
+	FIELD eS BLOCK_REDSTONE_TORCH_BURNOUT Lnone/nk;
+	FIELD eT BLOCK_SAND_BREAK Lnone/nk;
+	FIELD eU BLOCK_SAND_FALL Lnone/nk;
+	FIELD eV BLOCK_SAND_HIT Lnone/nk;
+	FIELD eW BLOCK_SAND_PLACE Lnone/nk;
+	FIELD eX BLOCK_SAND_STEP Lnone/nk;
+	FIELD eY ENTITY_SHEEP_AMBIENT Lnone/nk;
+	FIELD eZ ENTITY_SHEEP_DEATH Lnone/nk;
 	FIELD fa ENTITY_SHEEP_HURT Lnone/nk;
 	FIELD fb ENTITY_SHEEP_SHEAR Lnone/nk;
 	FIELD fc ENTITY_SHEEP_STEP Lnone/nk;
@@ -342,33 +337,32 @@ CLASS none/nl net/minecraft/reference/Sounds
 	FIELD fx ENTITY_SKELETON_HORSE_DEATH Lnone/nk;
 	FIELD fy ENTITY_SKELETON_HORSE_HURT Lnone/nk;
 	FIELD fz ENTITY_SKELETON_HURT Lnone/nk;
-	FIELD gA ENTITY_TNT_PRIMED Lnone/nk;
-	FIELD gB BLOCK_TRIPWIRE_ATTACH Lnone/nk;
-	FIELD gC BLOCK_TRIPWIRE_CLICK_OFF Lnone/nk;
-	FIELD gD BLOCK_TRIPWIRE_CLICK_ON Lnone/nk;
-	FIELD gE BLOCK_TRIPWIRE_DETACH Lnone/nk;
-	FIELD gF UI_BUTTON_CLICK Lnone/nk;
-	FIELD gG ENTITY_VILLAGER_AMBIENT Lnone/nk;
-	FIELD gH ENTITY_VILLAGER_DEATH Lnone/nk;
-	FIELD gI ENTITY_VILLAGER_HURT Lnone/nk;
-	FIELD gJ ENTITY_VILLAGER_NO Lnone/nk;
-	FIELD gK ENTITY_VILLAGER_TRADING Lnone/nk;
-	FIELD gL ENTITY_VILLAGER_YES Lnone/nk;
-	FIELD g BLOCK_ANVIL_PLACE Lnone/nk;
-	FIELD gM BLOCK_WATERLILY_PLACE Lnone/nk;
-	FIELD gN BLOCK_WATER_AMBIENT Lnone/nk;
-	FIELD gO WEATHER_RAIN Lnone/nk;
-	FIELD gP WEATHER_RAIN_ABOVE Lnone/nk;
-	FIELD gQ ENTITY_WITCH_AMBIENT Lnone/nk;
-	FIELD gR ENTITY_WITCH_DEATH Lnone/nk;
-	FIELD gS ENTITY_WITCH_DRINK Lnone/nk;
-	FIELD gT ENTITY_WITCH_HURT Lnone/nk;
-	FIELD gU ENTITY_WITCH_THROW Lnone/nk;
-	FIELD gV ENTITY_WITHER_AMBIENT Lnone/nk;
-	FIELD gW ENTITY_WITHER_BREAK_BLOCK Lnone/nk;
-	FIELD gX ENTITY_WITHER_DEATH Lnone/nk;
-	FIELD gY ENTITY_WITHER_HURT Lnone/nk;
-	FIELD gZ ENTITY_WITHER_SHOOT Lnone/nk;
+	FIELD fA ENTITY_SKELETON_SHOOT Lnone/nk;
+	FIELD fB ENTITY_SKELETON_STEP Lnone/nk;
+	FIELD fC ENTITY_SLIME_ATTACK Lnone/nk;
+	FIELD fD BLOCK_SLIME_BREAK Lnone/nk;
+	FIELD fE ENTITY_SLIME_DEATH Lnone/nk;
+	FIELD fF BLOCK_SLIME_FALL Lnone/nk;
+	FIELD fG BLOCK_SLIME_HIT Lnone/nk;
+	FIELD fH ENTITY_SLIME_HURT Lnone/nk;
+	FIELD fI ENTITY_SLIME_JUMP Lnone/nk;
+	FIELD fJ BLOCK_SLIME_PLACE Lnone/nk;
+	FIELD fK ENTITY_SLIME_SQUISH Lnone/nk;
+	FIELD fL BLOCK_SLIME_STEP Lnone/nk;
+	FIELD fM ENTITY_SMALL_MAGMACUBE_DEATH Lnone/nk;
+	FIELD fN ENTITY_SMALL_MAGMACUBE_HURT Lnone/nk;
+	FIELD fO ENTITY_SMALL_MAGMACUBE_SQUISH Lnone/nk;
+	FIELD fP ENTITY_SMALL_SLIME_DEATH Lnone/nk;
+	FIELD fQ ENTITY_SMALL_SLIME_HURT Lnone/nk;
+	FIELD fR ENTITY_SMALL_SLIME_JUMP Lnone/nk;
+	FIELD fS ENTITY_SMALL_SLIME_SQUISH Lnone/nk;
+	FIELD fT ENTITY_SNOWBALL_THROW Lnone/nk;
+	FIELD fU ENTITY_SNOWMAN_AMBIENT Lnone/nk;
+	FIELD fV ENTITY_SNOWMAN_DEATH Lnone/nk;
+	FIELD fW ENTITY_SNOWMAN_HURT Lnone/nk;
+	FIELD fX ENTITY_SNOWMAN_SHOOT Lnone/nk;
+	FIELD fY BLOCK_SNOW_BREAK Lnone/nk;
+	FIELD fZ BLOCK_SNOW_FALL Lnone/nk;
 	FIELD ga BLOCK_SNOW_HIT Lnone/nk;
 	FIELD gb BLOCK_SNOW_PLACE Lnone/nk;
 	FIELD gc BLOCK_SNOW_STEP Lnone/nk;
@@ -395,29 +389,32 @@ CLASS none/nl net/minecraft/reference/Sounds
 	FIELD gx ENTITY_STRAY_HURT Lnone/nk;
 	FIELD gy ENTITY_STRAY_STEP Lnone/nk;
 	FIELD gz ENCHANT_THORNS_HIT Lnone/nk;
-	FIELD hA BLOCK_WOOD_STEP Lnone/nk;
-	FIELD hB ENTITY_ZOMBIE_AMBIENT Lnone/nk;
-	FIELD hC ENTITY_ZOMBIE_ATTACK_DOOR_WOOD Lnone/nk;
-	FIELD hD ENTITY_ZOMBIE_ATTACK_IRON_DOOR Lnone/nk;
-	FIELD hE ENTITY_ZOMBIE_BREAK_DOOR_WOOD Lnone/nk;
-	FIELD hF ENTITY_ZOMBIE_DEATH Lnone/nk;
-	FIELD hG ENTITY_ZOMBIE_HORSE_AMBIENT Lnone/nk;
-	FIELD hH ENTITY_ZOMBIE_HORSE_DEATH Lnone/nk;
-	FIELD hI ENTITY_ZOMBIE_HORSE_HURT Lnone/nk;
-	FIELD hJ ENTITY_ZOMBIE_HURT Lnone/nk;
-	FIELD hK ENTITY_ZOMBIE_INFECT Lnone/nk;
-	FIELD hL ENTITY_ZOMBIE_PIG_AMBIENT Lnone/nk;
-	FIELD h BLOCK_ANVIL_STEP Lnone/nk;
-	FIELD hM ENTITY_ZOMBIE_PIG_ANGRY Lnone/nk;
-	FIELD hN ENTITY_ZOMBIE_PIG_DEATH Lnone/nk;
-	FIELD hO ENTITY_ZOMBIE_PIG_HURT Lnone/nk;
-	FIELD hP ENTITY_ZOMBIE_STEP Lnone/nk;
-	FIELD hQ ENTITY_ZOMBIE_VILLAGER_AMBIENT Lnone/nk;
-	FIELD hR ENTITY_ZOMBIE_VILLAGER_CONVERTED Lnone/nk;
-	FIELD hS ENTITY_ZOMBIE_VILLAGER_CURE Lnone/nk;
-	FIELD hT ENTITY_ZOMBIE_VILLAGER_DEATH Lnone/nk;
-	FIELD hU ENTITY_ZOMBIE_VILLAGER_HURT Lnone/nk;
-	FIELD hV ENTITY_ZOMBIE_VILLAGER_STEP Lnone/nk;
+	FIELD gA ENTITY_TNT_PRIMED Lnone/nk;
+	FIELD gB BLOCK_TRIPWIRE_ATTACH Lnone/nk;
+	FIELD gC BLOCK_TRIPWIRE_CLICK_OFF Lnone/nk;
+	FIELD gD BLOCK_TRIPWIRE_CLICK_ON Lnone/nk;
+	FIELD gE BLOCK_TRIPWIRE_DETACH Lnone/nk;
+	FIELD gF UI_BUTTON_CLICK Lnone/nk;
+	FIELD gG ENTITY_VILLAGER_AMBIENT Lnone/nk;
+	FIELD gH ENTITY_VILLAGER_DEATH Lnone/nk;
+	FIELD gI ENTITY_VILLAGER_HURT Lnone/nk;
+	FIELD gJ ENTITY_VILLAGER_NO Lnone/nk;
+	FIELD gK ENTITY_VILLAGER_TRADING Lnone/nk;
+	FIELD gL ENTITY_VILLAGER_YES Lnone/nk;
+	FIELD gM BLOCK_WATERLILY_PLACE Lnone/nk;
+	FIELD gN BLOCK_WATER_AMBIENT Lnone/nk;
+	FIELD gO WEATHER_RAIN Lnone/nk;
+	FIELD gP WEATHER_RAIN_ABOVE Lnone/nk;
+	FIELD gQ ENTITY_WITCH_AMBIENT Lnone/nk;
+	FIELD gR ENTITY_WITCH_DEATH Lnone/nk;
+	FIELD gS ENTITY_WITCH_DRINK Lnone/nk;
+	FIELD gT ENTITY_WITCH_HURT Lnone/nk;
+	FIELD gU ENTITY_WITCH_THROW Lnone/nk;
+	FIELD gV ENTITY_WITHER_AMBIENT Lnone/nk;
+	FIELD gW ENTITY_WITHER_BREAK_BLOCK Lnone/nk;
+	FIELD gX ENTITY_WITHER_DEATH Lnone/nk;
+	FIELD gY ENTITY_WITHER_HURT Lnone/nk;
+	FIELD gZ ENTITY_WITHER_SHOOT Lnone/nk;
 	FIELD ha ENTITY_WITHER_SPAWN Lnone/nk;
 	FIELD hb ENTITY_WITHER_SKELETON_AMBIENT Lnone/nk;
 	FIELD hc ENTITY_WITHER_SKELETON_DEATH Lnone/nk;
@@ -444,23 +441,27 @@ CLASS none/nl net/minecraft/reference/Sounds
 	FIELD hx BLOCK_WOOD_PLACE Lnone/nk;
 	FIELD hy BLOCK_WOOD_PRESSUREPLATE_CLICK_OFF Lnone/nk;
 	FIELD hz BLOCK_WOOD_PRESSUREPLATE_CLICK_ON Lnone/nk;
-	FIELD i BLOCK_ANVIL_USE Lnone/nk;
-	FIELD j ENTITY_ARMORSTAND_BREAK Lnone/nk;
-	FIELD k ENTITY_ARMORSTAND_FALL Lnone/nk;
-	FIELD l ENTITY_ARMORSTAND_HIT Lnone/nk;
-	FIELD m ENTITY_ARMORSTAND_PLACE Lnone/nk;
-	FIELD n ITEM_ARMOR_EQUIP_CHAIN Lnone/nk;
-	FIELD o ITEM_ARMOR_EQUIP_DIAMOND Lnone/nk;
-	FIELD p ITEM_ARMOR_EQUIP_GENERIC Lnone/nk;
-	FIELD q ITEM_ARMOR_EQUIP_GOLD Lnone/nk;
-	FIELD r ITEM_ARMOR_EQUIP_IRON Lnone/nk;
-	FIELD s ITEM_ARMOR_EQUIP_LEATHER Lnone/nk;
-	FIELD t ENTITY_ARROW_HIT Lnone/nk;
-	FIELD u ENTITY_ARROW_HIT_PLAYER Lnone/nk;
-	FIELD v ENTITY_ARROW_SHOOT Lnone/nk;
-	FIELD w ENTITY_BAT_AMBIENT Lnone/nk;
-	FIELD x ENTITY_BAT_DEATH Lnone/nk;
-	FIELD y ENTITY_BAT_HURT Lnone/nk;
-	FIELD z ENTITY_BAT_LOOP Lnone/nk;
+	FIELD hA BLOCK_WOOD_STEP Lnone/nk;
+	FIELD hB ENTITY_ZOMBIE_AMBIENT Lnone/nk;
+	FIELD hC ENTITY_ZOMBIE_ATTACK_DOOR_WOOD Lnone/nk;
+	FIELD hD ENTITY_ZOMBIE_ATTACK_IRON_DOOR Lnone/nk;
+	FIELD hE ENTITY_ZOMBIE_BREAK_DOOR_WOOD Lnone/nk;
+	FIELD hF ENTITY_ZOMBIE_DEATH Lnone/nk;
+	FIELD hG ENTITY_ZOMBIE_HORSE_AMBIENT Lnone/nk;
+	FIELD hH ENTITY_ZOMBIE_HORSE_DEATH Lnone/nk;
+	FIELD hI ENTITY_ZOMBIE_HORSE_HURT Lnone/nk;
+	FIELD hJ ENTITY_ZOMBIE_HURT Lnone/nk;
+	FIELD hK ENTITY_ZOMBIE_INFECT Lnone/nk;
+	FIELD hL ENTITY_ZOMBIE_PIG_AMBIENT Lnone/nk;
+	FIELD hM ENTITY_ZOMBIE_PIG_ANGRY Lnone/nk;
+	FIELD hN ENTITY_ZOMBIE_PIG_DEATH Lnone/nk;
+	FIELD hO ENTITY_ZOMBIE_PIG_HURT Lnone/nk;
+	FIELD hP ENTITY_ZOMBIE_STEP Lnone/nk;
+	FIELD hQ ENTITY_ZOMBIE_VILLAGER_AMBIENT Lnone/nk;
+	FIELD hR ENTITY_ZOMBIE_VILLAGER_CONVERTED Lnone/nk;
+	FIELD hS ENTITY_ZOMBIE_VILLAGER_CURE Lnone/nk;
+	FIELD hT ENTITY_ZOMBIE_VILLAGER_DEATH Lnone/nk;
+	FIELD hU ENTITY_ZOMBIE_VILLAGER_HURT Lnone/nk;
+	FIELD hV ENTITY_ZOMBIE_VILLAGER_STEP Lnone/nk;
 	METHOD a getSoundFromRegistry (Ljava/lang/String;)Lnone/nk;
 		ARG 0 id