diff --git a/enigma/simple_type_field_names.json5 b/enigma/simple_type_field_names.json5
index 6b1d525789..884d599cdb 100644
--- a/enigma/simple_type_field_names.json5
+++ b/enigma/simple_type_field_names.json5
@@ -163,6 +163,7 @@
       "contextKey"
     ]
   },
+  "net/minecraft/unmapped/C_laxmzoqs": "hand", // Hand
 
   // Village
   "net/minecraft/unmapped/C_argwryfu": { // TradeOffer
diff --git a/mappings/net/minecraft/Bootstrap.mapping b/mappings/net/minecraft/Bootstrap.mapping
index 058657385f..deb1793dde 100644
--- a/mappings/net/minecraft/Bootstrap.mapping
+++ b/mappings/net/minecraft/Bootstrap.mapping
@@ -1,5 +1,5 @@
 CLASS net/minecraft/unmapped/C_ntskruzf net/minecraft/Bootstrap
-	FIELD f_jltdqkzo initialized Z
+	FIELD f_jltdqkzo bootstrapped Z
 	FIELD f_ngridedi LOGGER Lorg/slf4j/Logger;
 	FIELD f_xjyhgcuw SYSOUT Ljava/io/PrintStream;
 	FIELD f_zebjlhsd bootstrapTime Ljava/util/concurrent/atomic/AtomicLong;
@@ -16,7 +16,7 @@ CLASS net/minecraft/unmapped/C_ntskruzf net/minecraft/Bootstrap
 		ARG 0 translations
 	METHOD m_kjgvbqvf (Ljava/util/function/Function;Lnet/minecraft/unmapped/C_gedhbjjb;Ljava/util/Set;Ljava/lang/Object;)V
 		ARG 3 object
-	METHOD m_prdfbylm initialize ()V
+	METHOD m_prdfbylm bootstrap ()V
 	METHOD m_ttynpujp getMissingTranslations ()Ljava/util/Set;
 	METHOD m_zldxcyiq (Ljava/lang/String;)V
 		ARG 0 key
diff --git a/mappings/net/minecraft/block/cauldron/CauldronBehavior.mapping b/mappings/net/minecraft/block/cauldron/CauldronBehavior.mapping
index 78c8ec3622..f433c57905 100644
--- a/mappings/net/minecraft/block/cauldron/CauldronBehavior.mapping
+++ b/mappings/net/minecraft/block/cauldron/CauldronBehavior.mapping
@@ -10,16 +10,13 @@ CLASS net/minecraft/unmapped/C_hwbtrnnh net/minecraft/block/cauldron/CauldronBeh
 		ARG 1 world
 		ARG 2 pos
 		ARG 3 player
-		ARG 4 hand
 		ARG 5 stack
 	METHOD m_cdnivare (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_jzrpycqo;Lnet/minecraft/unmapped/C_laxmzoqs;Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_ozuepbyj;
 		ARG 0 state
 		ARG 3 player
-		ARG 4 hand
 	METHOD m_cwysngpe (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_jzrpycqo;Lnet/minecraft/unmapped/C_laxmzoqs;Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_ozuepbyj;
 		ARG 0 state
 		ARG 3 player
-		ARG 4 hand
 	METHOD m_gzbzxllj (Lnet/minecraft/unmapped/C_txtbiemp;)Z
 		ARG 0 state
 	METHOD m_ilwjclcm (Lnet/minecraft/unmapped/C_txtbiemp;)Z
@@ -32,18 +29,14 @@ CLASS net/minecraft/unmapped/C_hwbtrnnh net/minecraft/block/cauldron/CauldronBeh
 		ARG 0 behavior
 	METHOD m_qajrbgzr fillWaterCauldron (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_jzrpycqo;Lnet/minecraft/unmapped/C_laxmzoqs;Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_ozuepbyj;
 	METHOD m_qqxoejhi cleanBanner (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_jzrpycqo;Lnet/minecraft/unmapped/C_laxmzoqs;Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_ozuepbyj;
-		ARG 4 hand
 	METHOD m_ubhkjwij cleanShulkerBox (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_jzrpycqo;Lnet/minecraft/unmapped/C_laxmzoqs;Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_ozuepbyj;
-		ARG 4 hand
-	METHOD m_ucoeawqp registerBehavior ()V
+	METHOD m_ucoeawqp bootstrap ()V
 	METHOD m_vaydxxdu cleanDyeable (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_jzrpycqo;Lnet/minecraft/unmapped/C_laxmzoqs;Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_ozuepbyj;
-		ARG 4 hand
 	METHOD m_vtaiddsw emptyCauldron (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_jzrpycqo;Lnet/minecraft/unmapped/C_laxmzoqs;Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_sddaxwyk;Ljava/util/function/Predicate;Lnet/minecraft/unmapped/C_avavozay;)Lnet/minecraft/unmapped/C_ozuepbyj;
 		ARG 0 state
 		ARG 1 world
 		ARG 2 pos
 		ARG 3 player
-		ARG 4 hand
 		ARG 5 stack
 		ARG 6 output
 		ARG 7 predicate
@@ -53,27 +46,22 @@ CLASS net/minecraft/unmapped/C_hwbtrnnh net/minecraft/block/cauldron/CauldronBeh
 		ARG 1 world
 		ARG 2 pos
 		ARG 3 player
-		ARG 4 hand
 		ARG 5 stack
 	METHOD m_wzwvxxvl (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_jzrpycqo;Lnet/minecraft/unmapped/C_laxmzoqs;Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_ozuepbyj;
 		ARG 3 player
-		ARG 4 hand
 	METHOD m_xhjoujgn (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_jzrpycqo;Lnet/minecraft/unmapped/C_laxmzoqs;Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_ozuepbyj;
 		ARG 0 state
 		ARG 1 world
 		ARG 2 pos
 		ARG 3 player
-		ARG 4 hand
 		ARG 5 stack
 	METHOD m_ygjkpclc (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_jzrpycqo;Lnet/minecraft/unmapped/C_laxmzoqs;Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_ozuepbyj;
 		ARG 0 state
 		ARG 3 player
-		ARG 4 hand
 	METHOD m_zebtxswi fillCauldron (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_jzrpycqo;Lnet/minecraft/unmapped/C_laxmzoqs;Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_avavozay;)Lnet/minecraft/unmapped/C_ozuepbyj;
 		ARG 0 world
 		ARG 1 pos
 		ARG 2 player
-		ARG 3 hand
 		ARG 4 stack
 		ARG 5 state
 		ARG 6 soundEvent
diff --git a/mappings/net/minecraft/block/dispenser/ItemDispenserBehavior.mapping b/mappings/net/minecraft/block/dispenser/DefaultDispenserBehavior.mapping
similarity index 84%
rename from mappings/net/minecraft/block/dispenser/ItemDispenserBehavior.mapping
rename to mappings/net/minecraft/block/dispenser/DefaultDispenserBehavior.mapping
index 53c3137b2c..1b48fc51c3 100644
--- a/mappings/net/minecraft/block/dispenser/ItemDispenserBehavior.mapping
+++ b/mappings/net/minecraft/block/dispenser/DefaultDispenserBehavior.mapping
@@ -1,10 +1,10 @@
-CLASS net/minecraft/unmapped/C_dnfsxzwl net/minecraft/block/dispenser/ItemDispenserBehavior
+CLASS net/minecraft/unmapped/C_dnfsxzwl net/minecraft/block/dispenser/DefaultDispenserBehavior
 	FIELD f_vkzertet DEFAULT_SPAWN_VELOCITY_DEVIATION I
 	METHOD m_bzvzsacf spawnParticles (Lnet/minecraft/unmapped/C_wzdnszcs;Lnet/minecraft/unmapped/C_xpuuihxf;)V
-		ARG 1 pointer
+		ARG 1 context
 		ARG 2 side
-	METHOD m_clhynwvb dispenseSilently (Lnet/minecraft/unmapped/C_wzdnszcs;Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_sddaxwyk;
-		ARG 1 pointer
+	METHOD m_clhynwvb dispenseImpl (Lnet/minecraft/unmapped/C_wzdnszcs;Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_sddaxwyk;
+		ARG 1 context
 		ARG 2 stack
 	METHOD m_fhxczazc insertAndSpawnExcess (Lnet/minecraft/unmapped/C_wzdnszcs;Lnet/minecraft/unmapped/C_sddaxwyk;)V
 		ARG 1 block
@@ -14,9 +14,9 @@ CLASS net/minecraft/unmapped/C_dnfsxzwl net/minecraft/block/dispenser/ItemDispen
 		ARG 2 dispensedStack
 		ARG 3 remainder
 	METHOD m_nvxshqvu playSound (Lnet/minecraft/unmapped/C_wzdnszcs;)V
-		ARG 1 pointer
+		ARG 1 context
 	METHOD m_umjaspru playDefaultSound (Lnet/minecraft/unmapped/C_wzdnszcs;)V
-		ARG 0 pointer
+		ARG 0 context
 	METHOD m_yfabkxkw spawnDefaultParticles (Lnet/minecraft/unmapped/C_wzdnszcs;Lnet/minecraft/unmapped/C_xpuuihxf;)V
 		ARG 0 block
 		ARG 1 direction
diff --git a/mappings/net/minecraft/block/dispenser/DispenserBehavior.mapping b/mappings/net/minecraft/block/dispenser/DispenserBehavior.mapping
index e57ee143d5..4ba35ba1cf 100644
--- a/mappings/net/minecraft/block/dispenser/DispenserBehavior.mapping
+++ b/mappings/net/minecraft/block/dispenser/DispenserBehavior.mapping
@@ -2,6 +2,10 @@ CLASS net/minecraft/unmapped/C_ooeeaffg net/minecraft/block/dispenser/DispenserB
 	FIELD f_qafvtfzb LOGGER Lorg/slf4j/Logger;
 	FIELD f_szadkszc NOOP Lnet/minecraft/unmapped/C_ooeeaffg;
 	METHOD m_ujgviwhs doDispense (Lnet/minecraft/unmapped/C_wzdnszcs;Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_sddaxwyk;
-		ARG 0 pointer
+		ARG 0 context
 		ARG 1 stack
-	METHOD m_ummkrstn registerDefaults ()V
+	METHOD m_ummkrstn bootstrap ()V
+	CLASS C_genfnnji
+		FIELD f_rnenkqvi fallbackBehavior Lnet/minecraft/unmapped/C_dnfsxzwl;
+	CLASS C_ivungvuf
+		FIELD f_guppwqen fallbackBehavior Lnet/minecraft/unmapped/C_dnfsxzwl;
diff --git a/mappings/net/minecraft/block/dispenser/DispenserBlock.mapping b/mappings/net/minecraft/block/dispenser/DispenserBlock.mapping
index 5d6d111e08..ca6a96ae91 100644
--- a/mappings/net/minecraft/block/dispenser/DispenserBlock.mapping
+++ b/mappings/net/minecraft/block/dispenser/DispenserBlock.mapping
@@ -5,7 +5,7 @@ CLASS net/minecraft/unmapped/C_sridforj net/minecraft/block/dispenser/DispenserB
 	FIELD f_kigvivjn FACING Lnet/minecraft/unmapped/C_cgckxfsw;
 	FIELD f_mqswtdqm TRIGGERED Lnet/minecraft/unmapped/C_xhwijdsd;
 	FIELD f_xxtgryhz DEFAULT_BEHAVIOR Lnet/minecraft/unmapped/C_dnfsxzwl;
-	METHOD m_fnobacze getBehaviorForItem (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_ooeeaffg;
+	METHOD m_fnobacze getBehavior (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_ooeeaffg;
 		ARG 2 stack
 	METHOD m_jiinrsul registerBehavior (Lnet/minecraft/unmapped/C_gmbqjnle;Lnet/minecraft/unmapped/C_ooeeaffg;)V
 		ARG 0 provider
@@ -16,6 +16,7 @@ CLASS net/minecraft/unmapped/C_sridforj net/minecraft/block/dispenser/DispenserB
 		ARG 3 offset
 	METHOD m_omkokomw registerBehavior (Lnet/minecraft/unmapped/C_gmbqjnle;)V
 		ARG 0 item
+	METHOD m_pktcfwfi getBehavior (Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_ooeeaffg;
 	METHOD m_tfzksanp getDispensePos (Lnet/minecraft/unmapped/C_wzdnszcs;)Lnet/minecraft/unmapped/C_ogbhoqwb;
 		ARG 0 block
 	METHOD m_xmkonidr dispense (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_hynzadkk;)V
diff --git a/mappings/net/minecraft/util/math/BlockPointer.mapping b/mappings/net/minecraft/block/dispenser/DispenserContext.mapping
similarity index 68%
rename from mappings/net/minecraft/util/math/BlockPointer.mapping
rename to mappings/net/minecraft/block/dispenser/DispenserContext.mapping
index f55f53de53..3e48a271f1 100644
--- a/mappings/net/minecraft/util/math/BlockPointer.mapping
+++ b/mappings/net/minecraft/block/dispenser/DispenserContext.mapping
@@ -1,4 +1,4 @@
-CLASS net/minecraft/unmapped/C_wzdnszcs net/minecraft/util/math/BlockPointer
+CLASS net/minecraft/unmapped/C_wzdnszcs net/minecraft/block/dispenser/DispenserContext
 	FIELD f_iumwlodc world Lnet/minecraft/unmapped/C_bdwnwhiu;
 	METHOD m_eildmjnz world ()Lnet/minecraft/unmapped/C_bdwnwhiu;
 	METHOD m_jqrqggsy center ()Lnet/minecraft/unmapped/C_vgpupfxx;
diff --git a/mappings/net/minecraft/block/dispenser/EquipmentDispenserBehavior.mapping b/mappings/net/minecraft/block/dispenser/EquipmentDispenserBehavior.mapping
new file mode 100644
index 0000000000..a4e0ec757c
--- /dev/null
+++ b/mappings/net/minecraft/block/dispenser/EquipmentDispenserBehavior.mapping
@@ -0,0 +1,4 @@
+CLASS net/minecraft/unmapped/C_grwaorwt net/minecraft/block/dispenser/EquipmentDispenserBehavior
+	FIELD f_fngceafg INSTANCE Lnet/minecraft/unmapped/C_grwaorwt;
+	METHOD m_rnoitqxu tryDispensingEquipment (Lnet/minecraft/unmapped/C_wzdnszcs;Lnet/minecraft/unmapped/C_sddaxwyk;)Z
+		ARG 0 context
diff --git a/mappings/net/minecraft/block/dispenser/FallibleItemDispenserBehavior.mapping b/mappings/net/minecraft/block/dispenser/FallibleDispenserBehavior.mapping
similarity index 83%
rename from mappings/net/minecraft/block/dispenser/FallibleItemDispenserBehavior.mapping
rename to mappings/net/minecraft/block/dispenser/FallibleDispenserBehavior.mapping
index ffc5d436a0..f2dbafc2f4 100644
--- a/mappings/net/minecraft/block/dispenser/FallibleItemDispenserBehavior.mapping
+++ b/mappings/net/minecraft/block/dispenser/FallibleDispenserBehavior.mapping
@@ -1,4 +1,4 @@
-CLASS net/minecraft/unmapped/C_hptpezss net/minecraft/block/dispenser/FallibleItemDispenserBehavior
+CLASS net/minecraft/unmapped/C_hptpezss net/minecraft/block/dispenser/FallibleDispenserBehavior
 	FIELD f_esneqxoh success Z
 	METHOD m_lqrzzjek setSuccess (Z)V
 		ARG 1 success
diff --git a/mappings/net/minecraft/block/dispenser/MinecartDispenserBehavior.mapping b/mappings/net/minecraft/block/dispenser/MinecartDispenserBehavior.mapping
new file mode 100644
index 0000000000..c7e74eafa5
--- /dev/null
+++ b/mappings/net/minecraft/block/dispenser/MinecartDispenserBehavior.mapping
@@ -0,0 +1,4 @@
+CLASS net/minecraft/unmapped/C_ueplrtkn net/minecraft/block/dispenser/MinecartDispenserBehavior
+	FIELD f_cncndyni minecartType Lnet/minecraft/unmapped/C_ogavsvbr;
+	FIELD f_vkvgsepf fallbackBehavior Lnet/minecraft/unmapped/C_dnfsxzwl;
+	METHOD m_usvwpxuu getRailShape (Lnet/minecraft/unmapped/C_txtbiemp;)Lnet/minecraft/unmapped/C_wqmdpcsg;
diff --git a/mappings/net/minecraft/client/network/ClientPlayerInteractionManager.mapping b/mappings/net/minecraft/client/network/ClientPlayerInteractionManager.mapping
index e50e98ba23..e747c6a9ff 100644
--- a/mappings/net/minecraft/client/network/ClientPlayerInteractionManager.mapping
+++ b/mappings/net/minecraft/client/network/ClientPlayerInteractionManager.mapping
@@ -91,7 +91,7 @@ CLASS net/minecraft/unmapped/C_uxbydbcj net/minecraft/client/network/ClientPlaye
 	METHOD m_vvsqjptk sendActionPacket (Lnet/minecraft/unmapped/C_ghdnlrrw;Lnet/minecraft/unmapped/C_suesdakf;)V
 		ARG 2 packetFactory
 	METHOD m_wflwwroo hasRidingInventory ()Z
-	METHOD m_wiqrsdhj doInteractBlock (Lnet/minecraft/unmapped/C_jlopmfei;Lnet/minecraft/unmapped/C_laxmzoqs;Lnet/minecraft/unmapped/C_jdakttms;)Lnet/minecraft/unmapped/C_ozuepbyj;
+	METHOD m_wiqrsdhj interactBlockImpl (Lnet/minecraft/unmapped/C_jlopmfei;Lnet/minecraft/unmapped/C_laxmzoqs;Lnet/minecraft/unmapped/C_jdakttms;)Lnet/minecraft/unmapped/C_ozuepbyj;
 		ARG 1 player
 		ARG 2 hand
 		ARG 3 hitResult
diff --git a/mappings/net/minecraft/command/EntitySelectorOptions.mapping b/mappings/net/minecraft/command/EntitySelectorOptions.mapping
index 0d5cf61297..453caf0359 100644
--- a/mappings/net/minecraft/command/EntitySelectorOptions.mapping
+++ b/mappings/net/minecraft/command/EntitySelectorOptions.mapping
@@ -73,7 +73,7 @@ CLASS net/minecraft/unmapped/C_pgmsoxco net/minecraft/command/EntitySelectorOpti
 		ARG 0 reader
 	METHOD m_onjxcyst (Lnet/minecraft/unmapped/C_iejqjrhb;)V
 		ARG 0 reader
-	METHOD m_otjwzrqy register ()V
+	METHOD m_otjwzrqy bootstrap ()V
 	METHOD m_pcivztzq (Lnet/minecraft/unmapped/C_iejqjrhb;)V
 		ARG 0 reader
 	METHOD m_ptvtrdeo (Lnet/minecraft/unmapped/C_iejqjrhb;)V
diff --git a/mappings/net/minecraft/util/hit/BlockHitResult.mapping b/mappings/net/minecraft/util/hit/BlockHitResult.mapping
index cd289d07e0..72ec903759 100644
--- a/mappings/net/minecraft/util/hit/BlockHitResult.mapping
+++ b/mappings/net/minecraft/util/hit/BlockHitResult.mapping
@@ -7,20 +7,21 @@ CLASS net/minecraft/unmapped/C_jdakttms net/minecraft/util/hit/BlockHitResult
 	METHOD <init> (Lnet/minecraft/unmapped/C_vgpupfxx;Lnet/minecraft/unmapped/C_xpuuihxf;Lnet/minecraft/unmapped/C_hynzadkk;Z)V
 		ARG 2 side
 		ARG 3 blockPos
-		ARG 4 insideBlock
 	METHOD <init> (Lnet/minecraft/unmapped/C_vgpupfxx;Lnet/minecraft/unmapped/C_xpuuihxf;Lnet/minecraft/unmapped/C_hynzadkk;ZZ)V
+		ARG 2 side
 		ARG 3 blockPos
 	METHOD <init> (ZLnet/minecraft/unmapped/C_vgpupfxx;Lnet/minecraft/unmapped/C_xpuuihxf;Lnet/minecraft/unmapped/C_hynzadkk;ZZ)V
+		ARG 3 side
 		ARG 4 blockPos
 	METHOD m_ajzjlusu withSide (Lnet/minecraft/unmapped/C_xpuuihxf;)Lnet/minecraft/unmapped/C_jdakttms;
 		ARG 1 side
-	METHOD m_bvfnqjyq createMissed (Lnet/minecraft/unmapped/C_vgpupfxx;Lnet/minecraft/unmapped/C_xpuuihxf;Lnet/minecraft/unmapped/C_hynzadkk;)Lnet/minecraft/unmapped/C_jdakttms;
-		ARG 0 pos
+	METHOD m_bvfnqjyq missOf (Lnet/minecraft/unmapped/C_vgpupfxx;Lnet/minecraft/unmapped/C_xpuuihxf;Lnet/minecraft/unmapped/C_hynzadkk;)Lnet/minecraft/unmapped/C_jdakttms;
 		ARG 1 side
 		ARG 2 blockPos
 	METHOD m_cftjzwqf getSide ()Lnet/minecraft/unmapped/C_xpuuihxf;
 	METHOD m_nallecrp withBlockPos (Lnet/minecraft/unmapped/C_hynzadkk;)Lnet/minecraft/unmapped/C_jdakttms;
 		ARG 1 blockPos
 	METHOD m_pfrejwjs hitWorldBorder ()Z
+	METHOD m_rzuzqmeh withHitWorldBorder ()Lnet/minecraft/unmapped/C_jdakttms;
 	METHOD m_ufhsbnfs isInsideBlock ()Z
 	METHOD m_vjgmulgm getBlockPos ()Lnet/minecraft/unmapped/C_hynzadkk;
diff --git a/mappings/net/minecraft/world/WorldEvents.mapping b/mappings/net/minecraft/world/WorldEvents.mapping
index c5592fca11..8aac472056 100644
--- a/mappings/net/minecraft/world/WorldEvents.mapping
+++ b/mappings/net/minecraft/world/WorldEvents.mapping
@@ -40,7 +40,7 @@ CLASS net/minecraft/unmapped/C_kkbhcwdu net/minecraft/world/WorldEvents
 		COMMENT <br>Plays the dispenser fail sound event.
 		COMMENT <p>Called by {@link net.minecraft.block.dispenser.DispenserBlock#dispense(net.minecraft.server.world.ServerWorld, net.minecraft.block.BlockState, net.minecraft.util.math.BlockPos) DispenserBlock#dispense},
 		COMMENT {@link net.minecraft.block.DropperBlock#dispense(net.minecraft.server.world.ServerWorld, net.minecraft.block.BlockState, net.minecraft.util.math.BlockPos) DropperBlock#dispense},
-		COMMENT and {@link net.minecraft.block.dispenser.FallibleItemDispenserBehavior#playSound(net.minecraft.util.math.BlockPointer) FallibleItemDispenserBehavior#playSound}
+		COMMENT and {@link net.minecraft.block.dispenser.FallibleDispenserBehavior#playSound(net.minecraft.block.dispenser.DispenserContext) FallibleDispenserBehavior#playSound}
 	FIELD f_dxpbmduz HUSK_CONVERTS_TO_ZOMBIE I
 		COMMENT A Husk converts into a Zombie.
 		COMMENT <br>Plays the husk convert to zombie sound event.
@@ -100,9 +100,9 @@ CLASS net/minecraft/unmapped/C_kkbhcwdu net/minecraft/world/WorldEvents
 	FIELD f_hcwfwxmp DISPENSER_DISPENSES I
 		COMMENT A Dispenser dispenses an item.
 		COMMENT <br>Plays the dispensing sound event.
-		COMMENT <p>Called by {@link net.minecraft.block.dispenser.BoatDispenserBehavior#playSound(net.minecraft.util.math.BlockPointer) BoatDispenserBehavior#playSound},
-		COMMENT {@link net.minecraft.block.dispenser.FallibleItemDispenserBehavior#playSound(net.minecraft.util.math.BlockPointer) FallibleItemDispenserBehavior#playSound},
-		COMMENT and {@link net.minecraft.block.dispenser.ItemDispenserBehavior#playSound(net.minecraft.util.math.BlockPointer) ItemDispenserBehavior#playSound}
+		COMMENT <p>Called by {@link net.minecraft.block.dispenser.BoatDispenserBehavior#playSound(net.minecraft.block.dispenser.DispenserContext) BoatDispenserBehavior#playSound},
+		COMMENT {@link net.minecraft.block.dispenser.FallibleDispenserBehavior#playSound(net.minecraft.block.dispenser.DispenserContext) FallibleItemDispenserBehavior#playSound},
+		COMMENT and {@link net.minecraft.block.dispenser.DefaultDispenserBehavior#playSound(net.minecraft.block.dispenser.DispenserContext) ItemDispenserBehavior#playSound}
 	FIELD f_inmlykmt ENDER_DRAGON_BREAKS_BLOCK I
 		COMMENT An Ender Dragon breaks a block.
 		COMMENT <br>Spawns an explosion particle.
@@ -149,7 +149,7 @@ CLASS net/minecraft/unmapped/C_kkbhcwdu net/minecraft/world/WorldEvents
 		COMMENT Bone meal is used.
 		COMMENT <br>Plays the bone meal item used sound event and spawns happy villager particles.
 		COMMENT <p>Called by {@link net.minecraft.item.BoneMealItem#useOnBlock(net.minecraft.item.ItemUsageContext) BoneMealItem#useOnBlock},
-		COMMENT an anonymus class in {@link net.minecraft.block.dispenser.DispenserBehavior#registerDefaults() DispenserBehavior#registerDefaults},
+		COMMENT an anonymus class in {@link net.minecraft.block.dispenser.DispenserBehavior#bootstrap() DispenserBehavior#bootstrap},
 		COMMENT and {@link net.minecraft.entity.ai.brain.task.BoneMealTask#keepRunning(net.minecraft.server.world.ServerWorld, net.minecraft.entity.passive.VillagerEntity, long) BoneMealTask#keepRunning}
 	FIELD f_mraaptwq TRIAL_SPAWNER_DETECTS_PLAYER I
 	FIELD f_mwaqmoge DISPENSER_LAUNCHES_PROJECTILE I