diff --git a/mappings/net/minecraft/block/AbstractTorchBlock.mapping b/mappings/net/minecraft/block/AbstractTorchBlock.mapping
index a621bb7cfc..8a56e2796b 100644
--- a/mappings/net/minecraft/block/AbstractTorchBlock.mapping
+++ b/mappings/net/minecraft/block/AbstractTorchBlock.mapping
@@ -1,2 +1,3 @@
 CLASS net/minecraft/unmapped/C_teovrngh net/minecraft/block/AbstractTorchBlock
+	FIELD f_qcgutmrp SHAPE_STANDING_OFFSET I
 	FIELD f_ysrmomgy SHAPE Lnet/minecraft/unmapped/C_zscvhwbd;
diff --git a/mappings/net/minecraft/block/NetherPortalBlock.mapping b/mappings/net/minecraft/block/NetherPortalBlock.mapping
index c19b01fcd6..2f9945a729 100644
--- a/mappings/net/minecraft/block/NetherPortalBlock.mapping
+++ b/mappings/net/minecraft/block/NetherPortalBlock.mapping
@@ -10,7 +10,7 @@ CLASS net/minecraft/unmapped/C_zpsdinym net/minecraft/block/NetherPortalBlock
 		ARG 4 scaledPos
 		ARG 5 nether
 		ARG 6 border
-	METHOD m_fzuhemna (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_wauhtoaq$C_tqypnjit;Lnet/minecraft/unmapped/C_xpuuihxf$C_rmpfouoz;Lnet/minecraft/unmapped/C_vgpupfxx;Lnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_vgpupfxx;FFLnet/minecraft/unmapped/C_zbvyjshu$C_pytyshdn;)Lnet/minecraft/unmapped/C_zbvyjshu;
+	METHOD m_fzuhemna createDestination (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_wauhtoaq$C_tqypnjit;Lnet/minecraft/unmapped/C_xpuuihxf$C_rmpfouoz;Lnet/minecraft/unmapped/C_vgpupfxx;Lnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_vgpupfxx;FFLnet/minecraft/unmapped/C_zbvyjshu$C_pytyshdn;)Lnet/minecraft/unmapped/C_zbvyjshu;
 		ARG 1 portalRectangle
 		ARG 2 startAxis
 		ARG 3 offset
@@ -19,7 +19,7 @@ CLASS net/minecraft/unmapped/C_zpsdinym net/minecraft/block/NetherPortalBlock
 		ARG 6 yaw
 		ARG 7 pitch
 		ARG 8 transition
-	METHOD m_kvaymgqu (Lnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_wauhtoaq$C_tqypnjit;Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_zbvyjshu$C_pytyshdn;)Lnet/minecraft/unmapped/C_zbvyjshu;
+	METHOD m_kvaymgqu createDestination (Lnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_wauhtoaq$C_tqypnjit;Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_zbvyjshu$C_pytyshdn;)Lnet/minecraft/unmapped/C_zbvyjshu;
 		ARG 0 entity
 		ARG 2 portalRectangle
 		ARG 4 transition
diff --git a/mappings/net/minecraft/block/RedstoneWireBlock.mapping b/mappings/net/minecraft/block/RedstoneWireBlock.mapping
index 8b49219012..695fee45b5 100644
--- a/mappings/net/minecraft/block/RedstoneWireBlock.mapping
+++ b/mappings/net/minecraft/block/RedstoneWireBlock.mapping
@@ -45,6 +45,11 @@ CLASS net/minecraft/unmapped/C_hbdlqish net/minecraft/block/RedstoneWireBlock
 		ARG 2 random
 		ARG 3 pos
 		ARG 4 color
+		ARG 5 support
+		ARG 6 connection
+		ARG 7 offset
+		ARG 8 randomFactor
+			COMMENT higher values make particles both more likely and further randomly offset
 	METHOD m_nxtwfpnw updateOffsetNeighbors (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;)V
 		ARG 1 world
 		ARG 2 pos
diff --git a/mappings/net/minecraft/block/TrialSpawnerConfig.mapping b/mappings/net/minecraft/block/TrialSpawnerConfig.mapping
index ab588aedd1..b84741ad8b 100644
--- a/mappings/net/minecraft/block/TrialSpawnerConfig.mapping
+++ b/mappings/net/minecraft/block/TrialSpawnerConfig.mapping
@@ -2,6 +2,7 @@ CLASS net/minecraft/unmapped/C_pocjjnjk net/minecraft/block/TrialSpawnerConfig
 	FIELD f_ykrjgiui DEFAULT_INSTANCE Lnet/minecraft/unmapped/C_pocjjnjk;
 	METHOD m_fsslncbi getSimultaneousMobs (I)I
 		ARG 1 additionalPlayers
+	METHOD m_rjwfxsix getCooldown ()J
 	METHOD m_snjxtjjk getTotalMobs (I)I
 		ARG 1 additionalPlayers
 	METHOD m_wydezwto (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
diff --git a/mappings/net/minecraft/block/TrialSpawnerData.mapping b/mappings/net/minecraft/block/TrialSpawnerData.mapping
index 0c8538fb80..a9ef02dd90 100644
--- a/mappings/net/minecraft/block/TrialSpawnerData.mapping
+++ b/mappings/net/minecraft/block/TrialSpawnerData.mapping
@@ -8,19 +8,31 @@ CLASS net/minecraft/unmapped/C_kxkfzuix net/minecraft/block/TrialSpawnerData
 	FIELD f_nhtyttsu NEXT_WAVE_SPAWN_TIME_KEY Ljava/lang/String;
 	FIELD f_qcltsbcl registeredPlayers Ljava/util/Set;
 	FIELD f_tdzlonpc displayEntity Lnet/minecraft/unmapped/C_astfners;
+	FIELD f_toyfthwb BASE_TRIAL_OMEN_EFFECT_DURATION I
 	FIELD f_vhhqtdzo SPAWN_DATA_KEY Ljava/lang/String;
+	FIELD f_vvurntvw lootPool Lnet/minecraft/unmapped/C_owfsqzhr;
 	FIELD f_wunezcil nextMobSpawnTime J
+	FIELD f_xnjazxxb PLAYER_DETECTION_INTERVAL I
 	FIELD f_yqqgmcxl cooldownEndTime J
 	METHOD <init> (Ljava/util/Set;Ljava/util/Set;JJILjava/util/Optional;Ljava/util/Optional;)V
 		ARG 1 registeredPlayers
 		ARG 2 currentMobs
+	METHOD m_fazowizq choosePlayerWithOmen (Lnet/minecraft/unmapped/C_bdwnwhiu;Ljava/util/List;)Ljava/util/Optional;
+		ARG 1 playerUuids
 	METHOD m_gutsddek (Lnet/minecraft/unmapped/C_kxkfzuix;)Ljava/util/Optional;
 		ARG 0 data
+	METHOD m_hczcnors (Lnet/minecraft/unmapped/C_hhlwcnih;Lnet/minecraft/unmapped/C_edcjbljn;)V
+		ARG 1 nbt
 	METHOD m_hqnuaozt detectPlayers (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_jelkcvqk;)V
+		ARG 3 logic
 	METHOD m_jyshkmfh (Lnet/minecraft/unmapped/C_kxkfzuix;)Ljava/util/Set;
 		ARG 0 data
 	METHOD m_kjmtebfw isReadyToEjectReward (Lnet/minecraft/unmapped/C_bdwnwhiu;FI)Z
 		ARG 2 delay
+		ARG 3 cooldown
+	METHOD m_ksndgamr tryConvertBadOmenToTrialOmen (Lnet/minecraft/unmapped/C_jzrpycqo;)V
+	METHOD m_lcwzrxzo (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_astfners;)V
+		ARG 1 entity
 	METHOD m_lehgjndi (Lnet/minecraft/unmapped/C_kxkfzuix;)Ljava/lang/Long;
 		ARG 0 data
 	METHOD m_lptaqeuw areMobsDead ()Z
@@ -35,9 +47,12 @@ CLASS net/minecraft/unmapped/C_kxkfzuix net/minecraft/block/TrialSpawnerData
 		ARG 2 config
 	METHOD m_phbcnwhj isReadyToOpenShutter (Lnet/minecraft/unmapped/C_bdwnwhiu;FI)Z
 		ARG 2 delay
+		ARG 3 cooldown
 	METHOD m_pyggveyz getOrCreateNextSpawnData (Lnet/minecraft/unmapped/C_jelkcvqk;Lnet/minecraft/unmapped/C_rlomrsco;)Lnet/minecraft/unmapped/C_edcjbljn;
 		ARG 1 spawnerLogic
 	METHOD m_qacxasem reset ()V
+	METHOD m_qagcinaf getLootPool (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_pocjjnjk;Lnet/minecraft/unmapped/C_hynzadkk;)Lnet/minecraft/unmapped/C_owfsqzhr;
+		ARG 2 config
 	METHOD m_qsauossa (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
 		ARG 0 instance
 	METHOD m_rdtrxuhq hasSpawnedAllMobs (Lnet/minecraft/unmapped/C_pocjjnjk;I)Z
@@ -47,11 +62,16 @@ CLASS net/minecraft/unmapped/C_kxkfzuix net/minecraft/block/TrialSpawnerData
 	METHOD m_rvfytrpa getLastDisplayEntityRotation ()D
 	METHOD m_sccvkbao setEntityType (Lnet/minecraft/unmapped/C_jelkcvqk;Lnet/minecraft/unmapped/C_rlomrsco;Lnet/minecraft/unmapped/C_ogavsvbr;)V
 		ARG 3 entityType
+	METHOD m_whezyyzf discardMobs (Lnet/minecraft/unmapped/C_jelkcvqk;Lnet/minecraft/unmapped/C_bdwnwhiu;)V
+		ARG 1 logic
 	METHOD m_wlnuwqxo (Lnet/minecraft/unmapped/C_kxkfzuix;)Ljava/util/Set;
 		ARG 0 data
 	METHOD m_xfiavzlc (Lnet/minecraft/unmapped/C_kxkfzuix;)Ljava/lang/Long;
 		ARG 0 data
 	METHOD m_xhldgvye isCooldownFinished (Lnet/minecraft/unmapped/C_bdwnwhiu;)Z
+	METHOD m_yilegshe (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_jelkcvqk;Lnet/minecraft/unmapped/C_hynzadkk;Lcom/mojang/datafixers/util/Pair;)V
+		ARG 3 playerAndEffect
 	METHOD m_yjdsgxat getDisplayEntityRotation ()D
 	METHOD m_zaglgfuk (Lnet/minecraft/unmapped/C_kxkfzuix;)Ljava/lang/Integer;
 		ARG 0 data
+	METHOD m_zdufupjc getLootSeed (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_hynzadkk;)J
diff --git a/mappings/net/minecraft/block/TripwireHookBlock.mapping b/mappings/net/minecraft/block/TripwireHookBlock.mapping
index 84de7fa3df..dc55d7689f 100644
--- a/mappings/net/minecraft/block/TripwireHookBlock.mapping
+++ b/mappings/net/minecraft/block/TripwireHookBlock.mapping
@@ -13,6 +13,10 @@ CLASS net/minecraft/unmapped/C_wyvomnwd net/minecraft/block/TripwireHookBlock
 	FIELD f_zpwnhrxx SCHEDULED_TICK_DELAY I
 	METHOD m_ayksouit update (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;ZZILnet/minecraft/unmapped/C_txtbiemp;)V
 		ARG 2 state
+		ARG 3 detach
+		ARG 4 updateConnectedWire
+		ARG 5 wireDistance
+		ARG 6 wireState
 	METHOD m_gyrhxotd updateNeighborsOnAxis (Lnet/minecraft/unmapped/C_mmxmpdoq;Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_xpuuihxf;)V
 	METHOD m_opfdnesr playSound (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;ZZZZ)V
 		ARG 2 attached
diff --git a/mappings/net/minecraft/block/enums/TrialSpawnerState.mapping b/mappings/net/minecraft/block/enums/TrialSpawnerState.mapping
index 7ed9e27e3f..1bfa87a885 100644
--- a/mappings/net/minecraft/block/enums/TrialSpawnerState.mapping
+++ b/mappings/net/minecraft/block/enums/TrialSpawnerState.mapping
@@ -6,18 +6,33 @@ CLASS net/minecraft/unmapped/C_mefvrcdp net/minecraft/block/enums/TrialSpawnerSt
 	FIELD f_ujehhhbc REWARD_EJECTION_DELAY I
 	FIELD f_vlliqbyk name Ljava/lang/String;
 	FIELD f_vmdjvapc SHUTTER_OPENING_DELAY F
+	METHOD m_aszkcoot (Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_jelkcvqk;Lnet/minecraft/unmapped/C_astfners;)Z
+		ARG 2 entity
 	METHOD m_bakqsrqc getEntityRotationSpeed ()D
 	METHOD m_bkyjhsim tick (Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_jelkcvqk;Lnet/minecraft/unmapped/C_bdwnwhiu;)Lnet/minecraft/unmapped/C_mefvrcdp;
 		ARG 2 logic
 	METHOD m_cdvvkjen getLuminance ()I
+	METHOD m_drqhttao tryGetItemSpawnerPos (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_jelkcvqk;Lnet/minecraft/unmapped/C_kxkfzuix;)Ljava/util/Optional;
+		ARG 2 logic
+		ARG 3 data
 	METHOD m_epcfmecd emitParticle (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Z)V
 		ARG 3 ominous
 	METHOD m_lbcodxhm hasRotatingEntity ()Z
-	METHOD m_qeqintcw (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_kxkfzuix;)Z
+	METHOD m_mlumwbvs trySpawnOminousItemSpawner (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_jelkcvqk;)V
+		ARG 3 logic
+	METHOD m_qeqintcw hasCooledDown (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_kxkfzuix;)Z
 		ARG 2 spawnerData
 	METHOD m_tpuvsmwl (Lnet/minecraft/unmapped/C_kxkfzuix;Lnet/minecraft/unmapped/C_jelkcvqk;Lnet/minecraft/unmapped/C_pmqmzyaq$C_fjdvobbd;)V
 		ARG 2 spawnData
 	METHOD m_ucdxdqvw isCapableOfSpawning ()Z
+	METHOD m_uexavfok calculatePosAbove (Lnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_bdwnwhiu;)Ljava/util/Optional;
+		ARG 0 entity
+	METHOD m_xrzqiqae chooseRandomItemSpawnerTarget (Ljava/util/List;Ljava/util/Set;Lnet/minecraft/unmapped/C_jelkcvqk;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_bdwnwhiu;)Lnet/minecraft/unmapped/C_astfners;
+		ARG 0 players
+		ARG 1 mobUuids
+		ARG 2 logic
+	METHOD m_zjngdkgx (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_kxkfzuix;Lnet/minecraft/unmapped/C_jelkcvqk;Lnet/minecraft/unmapped/C_vgpupfxx;)V
+		ARG 4 logic2
 	CLASS C_bccyitsl ParticleEmitter
 		FIELD f_fqijyvaw NONE Lnet/minecraft/unmapped/C_mefvrcdp$C_bccyitsl;
 		FIELD f_ibbxvdpf ACTIVE Lnet/minecraft/unmapped/C_mefvrcdp$C_bccyitsl;
@@ -28,6 +43,14 @@ CLASS net/minecraft/unmapped/C_mefvrcdp net/minecraft/block/enums/TrialSpawnerSt
 		METHOD m_gdzvmyph addParticle (Lnet/minecraft/unmapped/C_lwmufxcy;Lnet/minecraft/unmapped/C_vgpupfxx;Lnet/minecraft/unmapped/C_cdctfzbn;)V
 			ARG 0 particleType
 			ARG 1 pos
+		METHOD m_juzblqfk (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_rlomrsco;Lnet/minecraft/unmapped/C_hynzadkk;Z)V
+			ARG 3 ominous
+		METHOD m_uuuwvfrf (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_rlomrsco;Lnet/minecraft/unmapped/C_hynzadkk;Z)V
+			ARG 3 ominous
+		METHOD m_wnvrnrnj (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_rlomrsco;Lnet/minecraft/unmapped/C_hynzadkk;Z)V
+			ARG 3 ominous
+		METHOD m_yocavmbc (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_rlomrsco;Lnet/minecraft/unmapped/C_hynzadkk;Z)V
+			ARG 3 ominous
 	CLASS C_vevghdwi DisplayEntityRotationSpeeds
 		FIELD f_gauzfeiw SLOW D
 		FIELD f_gljtrkmn NONE D
diff --git a/mappings/net/minecraft/entity/mob/MobEntity.mapping b/mappings/net/minecraft/entity/mob/MobEntity.mapping
index a9424b8053..bf6fc77b94 100644
--- a/mappings/net/minecraft/entity/mob/MobEntity.mapping
+++ b/mappings/net/minecraft/entity/mob/MobEntity.mapping
@@ -53,6 +53,7 @@ CLASS net/minecraft/unmapped/C_dxkfswlz net/minecraft/entity/mob/MobEntity
 	METHOD m_cauyzlww getNavigation ()Lnet/minecraft/unmapped/C_atbvfjwi;
 	METHOD m_ckimhneu getPositionTarget ()Lnet/minecraft/unmapped/C_hynzadkk;
 	METHOD m_cpqekrmu clearPositionTarget ()V
+	METHOD m_cyqouyby dropPreservedEquipment ()V
 	METHOD m_dciqpbdm canImmediatelyDespawn (D)Z
 		ARG 1 distanceSquared
 	METHOD m_dijkljpy clearGoalsAndTasks ()V
@@ -119,6 +120,10 @@ CLASS net/minecraft/unmapped/C_dxkfswlz net/minecraft/entity/mob/MobEntity
 	METHOD m_lqlfsnxj getBodyYawSpeed ()I
 	METHOD m_lxcdvhkn enchantEquipment (Lnet/minecraft/unmapped/C_jmnzlycd;Lnet/minecraft/unmapped/C_rlomrsco;Lnet/minecraft/unmapped/C_yuycoehb;Lnet/minecraft/unmapped/C_jiailwzt;)V
 		ARG 3 slot
+	METHOD m_mapkswnb dropPreservedEquipment (Ljava/util/function/Predicate;)Ljava/util/Set;
+		COMMENT Drop equipment from slots that are guaranteed to drop and which match the passed {@code dropPredicate}
+		COMMENT @return slots containing equipment that doesn't match {@code dropPredicate}
+		ARG 1 dropPredicate
 	METHOD m_mbyporyt createBodyControl ()Lnet/minecraft/unmapped/C_vofymfgv;
 	METHOD m_mowaxfbl isLeftHanded ()Z
 	METHOD m_mrbrckqf isDisallowedInPeaceful ()Z