diff --git a/mappings/net/minecraft/block/enums/TrialSpawnerState.mapping b/mappings/net/minecraft/block/enums/TrialSpawnerState.mapping
index b20e83c9d1..7ed9e27e3f 100644
--- a/mappings/net/minecraft/block/enums/TrialSpawnerState.mapping
+++ b/mappings/net/minecraft/block/enums/TrialSpawnerState.mapping
@@ -8,9 +8,13 @@ CLASS net/minecraft/unmapped/C_mefvrcdp net/minecraft/block/enums/TrialSpawnerSt
 	FIELD f_vmdjvapc SHUTTER_OPENING_DELAY F
 	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_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
+		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
@@ -19,6 +23,8 @@ CLASS net/minecraft/unmapped/C_mefvrcdp net/minecraft/block/enums/TrialSpawnerSt
 		FIELD f_ibbxvdpf ACTIVE Lnet/minecraft/unmapped/C_mefvrcdp$C_bccyitsl;
 		FIELD f_kjgegjdt COOLDOWN Lnet/minecraft/unmapped/C_mefvrcdp$C_bccyitsl;
 		FIELD f_niudltvq WAITING Lnet/minecraft/unmapped/C_mefvrcdp$C_bccyitsl;
+		METHOD emit emit (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_rlomrsco;Lnet/minecraft/unmapped/C_hynzadkk;Z)V
+			ARG 4 ominous
 		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
diff --git a/mappings/net/minecraft/world/TrialSpawnerLogic.mapping b/mappings/net/minecraft/world/TrialSpawnerLogic.mapping
index c2e99d0a9f..763f0d14ed 100644
--- a/mappings/net/minecraft/world/TrialSpawnerLogic.mapping
+++ b/mappings/net/minecraft/world/TrialSpawnerLogic.mapping
@@ -1,17 +1,23 @@
 CLASS net/minecraft/unmapped/C_jelkcvqk net/minecraft/world/TrialSpawnerLogic
 	FIELD f_byggmrue playerDetector Lnet/minecraft/unmapped/C_kkiexczn;
 	FIELD f_cyizsevm AMBIENT_SOUND_CHANCE F
+	FIELD f_domukczm requiredPlayerRange I
 	FIELD f_gbkgifex forceSpawning Z
 	FIELD f_gtjnizww data Lnet/minecraft/unmapped/C_kxkfzuix;
 	FIELD f_jgbopvuf spawner Lnet/minecraft/unmapped/C_jelkcvqk$C_onmhuuws;
 	FIELD f_jjqhihbg MAX_MOB_TRACKING_DISTANCE I
+	FIELD f_nalzpmxu targetCooldownLength I
+	FIELD f_oeictsyk ominous Z
 	FIELD f_rqyxrnno playerDetectionSelector Lnet/minecraft/unmapped/C_kkiexczn$C_ztluwxut;
 	FIELD f_sobdyvtw MAX_MOB_TRACKING_RANGE I
+	FIELD f_xcfvwbbl ominousConfig Lnet/minecraft/unmapped/C_pocjjnjk;
+	FIELD f_xvaxtoox normalConfig Lnet/minecraft/unmapped/C_pocjjnjk;
 	METHOD m_aakzgwdf spawnMob (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_hynzadkk;)Ljava/util/Optional;
 	METHOD m_bfccdstr addSpawnParticles (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_rlomrsco;Lnet/minecraft/unmapped/C_lwmufxcy;)V
 	METHOD m_bfmdqsfz getPlayerDetector ()Lnet/minecraft/unmapped/C_kkiexczn;
 	METHOD m_bftllosi tickClient (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Z)V
 	METHOD m_dalhosuv addEjectItemParticles (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_rlomrsco;)V
+	METHOD m_dgbojbgg isOminous ()Z
 	METHOD m_eoussynw setState (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_mefvrcdp;)V
 		ARG 2 state
 	METHOD m_fyrxxjkq (Lnet/minecraft/unmapped/C_pocjjnjk;Lnet/minecraft/unmapped/C_pocjjnjk;Lnet/minecraft/unmapped/C_kxkfzuix;Ljava/lang/Integer;Ljava/lang/Integer;)Lnet/minecraft/unmapped/C_jelkcvqk;
@@ -20,17 +26,21 @@ CLASS net/minecraft/unmapped/C_jelkcvqk net/minecraft/world/TrialSpawnerLogic
 	METHOD m_ggqvmzns ejectLoot (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_xhhleach;)V
 	METHOD m_gtgamtxz getState ()Lnet/minecraft/unmapped/C_mefvrcdp;
 	METHOD m_hvfivtpr getCodec ()Lcom/mojang/serialization/Codec;
+	METHOD m_hxfvrqzw getOminousConfig ()Lnet/minecraft/unmapped/C_pocjjnjk;
 	METHOD m_jioxfpfu (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
 		ARG 1 instance
 	METHOD m_kdobayrz forceSpawning ()V
+	METHOD m_kfckfdkf getOminousConfigForSerialization ()Lnet/minecraft/unmapped/C_pocjjnjk;
 	METHOD m_kyyyomnv hasLineOfSight (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_vgpupfxx;Lnet/minecraft/unmapped/C_vgpupfxx;)Z
 		ARG 1 spawnerPos
 		ARG 2 spawnPos
 	METHOD m_mugawpjd tickServer (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_hynzadkk;Z)V
+		ARG 3 ominous
 	METHOD m_qklxqrhx (DDDLnet/minecraft/unmapped/C_rlomrsco;Lnet/minecraft/unmapped/C_astfners;)Lnet/minecraft/unmapped/C_astfners;
 		ARG 7 entity
 	METHOD m_ukxfwbge canSpawnMobs (Lnet/minecraft/unmapped/C_cdctfzbn;)Z
 	METHOD m_uohhenov getData ()Lnet/minecraft/unmapped/C_kxkfzuix;
+	METHOD m_wablivuq getNormalConfig ()Lnet/minecraft/unmapped/C_pocjjnjk;
 	METHOD m_wubotvnx addDetectionParticles (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_rlomrsco;ILnet/minecraft/unmapped/C_nqucohct;)V
 		ARG 3 detectedPlayers
 	METHOD m_wujvpyvr setPlayerDetector (Lnet/minecraft/unmapped/C_kkiexczn;)V
diff --git a/mappings/net/minecraft/world/event/GameEvent.mapping b/mappings/net/minecraft/world/event/GameEvent.mapping
index 09744f0a6e..8b5a28487b 100644
--- a/mappings/net/minecraft/world/event/GameEvent.mapping
+++ b/mappings/net/minecraft/world/event/GameEvent.mapping
@@ -7,6 +7,7 @@ CLASS net/minecraft/unmapped/C_cgkchrmc net/minecraft/world/event/GameEvent
 		ARG 0 id
 		ARG 1 range
 	METHOD m_pypkrpmf range ()I
+	METHOD m_xkscnoxj bootstrap (Lnet/minecraft/unmapped/C_tqxyjqsk;)Lnet/minecraft/unmapped/C_cjzoxshv;
 	CLASS C_cjhidzon Context
 		FIELD f_qmegmqsi sourceEntity Lnet/minecraft/unmapped/C_astfners;
 		FIELD f_rzuicbpo affectedState Lnet/minecraft/unmapped/C_txtbiemp;
diff --git a/mappings/net/minecraft/world/event/PositionSourceType.mapping b/mappings/net/minecraft/world/event/PositionSourceType.mapping
index 11cd6a2d04..80455c58cf 100644
--- a/mappings/net/minecraft/world/event/PositionSourceType.mapping
+++ b/mappings/net/minecraft/world/event/PositionSourceType.mapping
@@ -1,4 +1,5 @@
 CLASS net/minecraft/unmapped/C_gwwcurwg net/minecraft/world/event/PositionSourceType
+	METHOD m_biyeqjqa getPacketCodec ()Lnet/minecraft/unmapped/C_qsrmwluu;
 	METHOD m_owdaplkq register (Ljava/lang/String;Lnet/minecraft/unmapped/C_gwwcurwg;)Lnet/minecraft/unmapped/C_gwwcurwg;
 		ARG 0 id
 		ARG 1 positionSourceType
diff --git a/mappings/net/minecraft/world/event/listener/GameEventListener.mapping b/mappings/net/minecraft/world/event/listener/GameEventListener.mapping
index 79eb3c0fd3..bc2f1c7b72 100644
--- a/mappings/net/minecraft/world/event/listener/GameEventListener.mapping
+++ b/mappings/net/minecraft/world/event/listener/GameEventListener.mapping
@@ -14,3 +14,5 @@ CLASS net/minecraft/unmapped/C_sbgxqpya net/minecraft/world/event/listener/GameE
 		COMMENT Returns the range, in blocks, of the listener.
 	METHOD m_gmqwtojk getDeliveryMode ()Lnet/minecraft/unmapped/C_sbgxqpya$C_exhjgbpz;
 	CLASS C_exhjgbpz DeliveryMode
+	CLASS C_ohqzxsuw Provider
+		METHOD m_duureayn getListener ()Lnet/minecraft/unmapped/C_sbgxqpya;
diff --git a/mappings/net/minecraft/world/updater/WorldUpdater.mapping b/mappings/net/minecraft/world/updater/WorldUpdater.mapping
index 5f60628318..0fe7625ff3 100644
--- a/mappings/net/minecraft/world/updater/WorldUpdater.mapping
+++ b/mappings/net/minecraft/world/updater/WorldUpdater.mapping
@@ -5,12 +5,15 @@ CLASS net/minecraft/unmapped/C_jzcarjio net/minecraft/world/updater/WorldUpdater
 	FIELD f_deqlyobn worlds Ljava/util/Set;
 	FIELD f_dzpntfoo totalChunkCount I
 	FIELD f_frolskzm eraseCache Z
+	FIELD f_gibhqwaa FINISHED_CHUNKS Lnet/minecraft/unmapped/C_npqneive;
 	FIELD f_hhfimkvd persistentStateManager Lnet/minecraft/unmapped/C_hsdphpvz;
 	FIELD f_hsjzkecg UPGRADING_ENTITIES Lnet/minecraft/unmapped/C_npqneive;
 	FIELD f_ibejvsgl totalRegionCount I
 	FIELD f_irolykku LOGGER Lorg/slf4j/Logger;
+	FIELD f_itsyqabx UPGRADING_POI Lnet/minecraft/unmapped/C_npqneive;
 	FIELD f_jtmnbhag dimensionProgress Lit/unimi/dsi/fastutil/objects/Reference2FloatMap;
 	FIELD f_nbwdozdh updateThread Ljava/lang/Thread;
+	FIELD f_ndykkudb FINISHED_POI Lnet/minecraft/unmapped/C_npqneive;
 	FIELD f_nxnlomkm UPDATE_THREAD_FACTORY Ljava/util/concurrent/ThreadFactory;
 	FIELD f_nzcxovsz NEW_PREFIX Ljava/lang/String;
 	FIELD f_ozofrqqg skippedChunkCount I
@@ -20,6 +23,8 @@ CLASS net/minecraft/unmapped/C_jzcarjio net/minecraft/world/updater/WorldUpdater
 	FIELD f_riylnter dataFixer Lcom/mojang/datafixers/DataFixer;
 	FIELD f_uhbjghsq progress F
 	FIELD f_vkuqljbv status Lnet/minecraft/unmapped/C_rdaqiwdt;
+	FIELD f_waxkuxwz FINISHED_ENTITIES Lnet/minecraft/unmapped/C_npqneive;
+	FIELD f_zgbdxxsa UPGRADING_CHUNKS Lnet/minecraft/unmapped/C_npqneive;
 	METHOD m_bfxislhb getWorlds ()Ljava/util/Set;
 	METHOD m_cpnvjmte cancel ()V
 	METHOD m_ejyoaaiq isDone ()Z