Skip to content

Commit

Permalink
Trial spawner mappings (#548)
Browse files Browse the repository at this point in the history 
* Trial spawner mappings

* Update mappings/net/minecraft/world/EntityDetector.mapping

Co-authored-by: Will <[email protected]>

* Remove TODO

* `WORLD_ENTITIES_SELECTOR` ->`WORLD_ENTITY_SELECTOR`

---------

Co-authored-by: Will <[email protected]>
  • Loading branch information
@IotaBread @supersaiyansubtlety
IotaBread and supersaiyansubtlety authored Feb 6, 2024
1 parent aad08a7 commit 50d9bbf
Show file tree
Hide file tree
Showing 9 changed files with 207 additions and 3 deletions.
11 changes: 11 additions & 0 deletions mappings/net/minecraft/block/Spawner.mapping
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
CLASS net/minecraft/unmapped/C_xheeywhc net/minecraft/block/Spawner
METHOD m_aohplshh setEntityType (Lnet/minecraft/unmapped/C_ogavsvbr;Lnet/minecraft/unmapped/C_rlomrsco;)V
ARG 1 entityType
METHOD m_jdhkawxq (Lnet/minecraft/unmapped/C_ogavsvbr;)Lnet/minecraft/unmapped/C_npqneive;
ARG 0 entityType
METHOD m_mfyyxczo getEntityFromNbt (Lnet/minecraft/unmapped/C_sddaxwyk;Ljava/lang/String;)Lnet/minecraft/unmapped/C_rdaqiwdt;
METHOD m_sldhtymu getEntityFromNbt (Lnet/minecraft/unmapped/C_hhlwcnih;Ljava/lang/String;)Lnet/minecraft/unmapped/C_ncpywfca;
ARG 0 nbt
ARG 1 dataKey
METHOD m_vysbdnfp appendTooltip (Lnet/minecraft/unmapped/C_sddaxwyk;Ljava/util/List;Ljava/lang/String;)V
ARG 1 tooltip
8 changes: 8 additions & 0 deletions mappings/net/minecraft/block/TrialSpawnerConfig.mapping
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
CLASS net/minecraft/unmapped/C_pocjjnjk net/minecraft/block/TrialSpawnerConfig
FIELD f_ykrjgiui defaultInstance Lnet/minecraft/unmapped/C_pocjjnjk;
METHOD m_fsslncbi getSimultaneousMobs (I)I
ARG 1 additionalPlayers
METHOD m_snjxtjjk getTotalMobs (I)I
ARG 1 additionalPlayers
METHOD m_wydezwto (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
ARG 0 instance
67 changes: 67 additions & 0 deletions mappings/net/minecraft/block/TrialSpawnerData.mapping
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
CLASS net/minecraft/unmapped/C_kxkfzuix net/minecraft/block/TrialSpawnerData
FIELD f_aktuhxoo currentMobs Ljava/util/Set;
FIELD f_bqnvrxui ejectingLootTable Ljava/util/Optional;
FIELD f_idcjkswu displayEntityRotation D
FIELD f_krsbsqwv spawnData Ljava/util/Optional;
FIELD f_lawaojtb lastDisplayEntityRotation D
FIELD f_mjgevwvn totalMobsSpawned I
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_tlbkcemq spawnDataPool Lnet/minecraft/unmapped/C_owfsqzhr;
FIELD f_vhhqtdzo SPAWN_DATA_KEY Ljava/lang/String;
FIELD f_wunezcil nextMobSpawnTime J
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_bwuchgfv (Lnet/minecraft/unmapped/C_hhlwcnih;Lnet/minecraft/unmapped/C_edcjbljn;)V
ARG 1 data
METHOD m_gutsddek (Lnet/minecraft/unmapped/C_kxkfzuix;)Ljava/util/Optional;
ARG 0 data
METHOD m_hqnuaozt detectPlayers (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_kkiexczn;Lnet/minecraft/unmapped/C_kkiexczn$C_ztluwxut;I)V
ARG 3 playerDetector
ARG 4 playerSelector
ARG 5 range
METHOD m_jyshkmfh (Lnet/minecraft/unmapped/C_kxkfzuix;)Ljava/util/Set;
ARG 0 data
METHOD m_kjmtebfw isReadyToEjectReward (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_pocjjnjk;F)Z
ARG 2 config
ARG 3 delay
METHOD m_lehgjndi (Lnet/minecraft/unmapped/C_kxkfzuix;)Ljava/lang/Long;
ARG 0 data
METHOD m_lptaqeuw areMobsDead ()Z
METHOD m_lqfpmalh hasSpawnData ()Z
METHOD m_mnonaikc getOrCreateDisplayEntity (Lnet/minecraft/unmapped/C_jelkcvqk;Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_mefvrcdp;)Lnet/minecraft/unmapped/C_astfners;
ARG 3 spawnerState
METHOD m_ncimrtbx getAdditionalPlayers (Lnet/minecraft/unmapped/C_hynzadkk;)I
ARG 1 spawnerPos
METHOD m_nfqmvsor getSyncedNbt (Lnet/minecraft/unmapped/C_mefvrcdp;)Lnet/minecraft/unmapped/C_hhlwcnih;
ARG 1 spawnerState
METHOD m_npuvzoxl isReadyToSpawnNewMobs (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_pocjjnjk;I)Z
ARG 2 config
METHOD m_phbcnwhj isReadyToOpenShutter (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_pocjjnjk;F)Z
ARG 2 config
ARG 3 delay
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_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
ARG 1 config
METHOD m_rqqikljp (Lnet/minecraft/unmapped/C_kxkfzuix;)Ljava/util/Optional;
ARG 0 data
METHOD m_rvfytrpa getLastDisplayEntityRotation ()D
METHOD m_rvlhmsgz setSpawnDataPool (Lnet/minecraft/unmapped/C_pocjjnjk;)V
ARG 1 config
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_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_yjdsgxat getDisplayEntityRotation ()D
METHOD m_zaglgfuk (Lnet/minecraft/unmapped/C_kxkfzuix;)Ljava/lang/Integer;
ARG 0 data
8 changes: 8 additions & 0 deletions mappings/net/minecraft/block/entity/TrialSpawnerBlockEntity.mapping
View file
Original file line number Diff line number Diff line change
@@ -1 +1,9 @@
CLASS net/minecraft/unmapped/C_ndgqjckh net/minecraft/block/entity/TrialSpawnerBlockEntity
FIELD f_fhtosxqw spawnerLogic Lnet/minecraft/unmapped/C_jelkcvqk;
METHOD m_jadbdmyt (Lcom/mojang/serialization/DataResult$PartialResult;)V
ARG 0 error
METHOD m_slpzeuyk (Lnet/minecraft/unmapped/C_jelkcvqk;)V
ARG 1 logic
METHOD m_wvhkrgdu getSpawnerLogic ()Lnet/minecraft/unmapped/C_jelkcvqk;
METHOD m_ziickmtk (Lnet/minecraft/unmapped/C_hhlwcnih;Lnet/minecraft/unmapped/C_oivssbvb;)V
ARG 1 logicNbt
34 changes: 34 additions & 0 deletions mappings/net/minecraft/block/enums/TrialSpawnerState.mapping
View file
Original file line number Diff line number Diff line change
@@ -1 +1,35 @@
CLASS net/minecraft/unmapped/C_mefvrcdp net/minecraft/block/enums/TrialSpawnerState
FIELD f_cvmyynjl particleEmitter Lnet/minecraft/unmapped/C_mefvrcdp$C_bccyitsl;
FIELD f_eszkuyea entityRotationSpeed D
FIELD f_mgbthnrg luminance I
FIELD f_swntygwn spawnCapable Z
FIELD f_ujehhhbc REWARD_EJECTION_DELAY I
FIELD f_vlliqbyk name Ljava/lang/String;
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;
METHOD m_cdvvkjen getLuminance ()I
METHOD m_epcfmecd emitParticle (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;)V
METHOD m_lbcodxhm hasRotatingEntity ()Z
METHOD m_nlhrasxl (Lnet/minecraft/unmapped/C_jelkcvqk;Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_ncpywfca;)V
ARG 3 lootTable
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
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;
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;)V
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
CLASS C_vevghdwi DisplayEntityRotationSpeeds
FIELD f_gauzfeiw SLOW D
FIELD f_gljtrkmn NONE D
FIELD f_mscpicrf FAST D
CLASS C_zwrttbii Luminance
FIELD f_cmrzasvm LOW I
FIELD f_cuofrvdp HIGH I
FIELD f_ycxnnjlw NONE I
6 changes: 3 additions & 3 deletions mappings/net/minecraft/client/render/block/entity/MobSpawnerBlockEntityRenderer.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ CLASS net/minecraft/unmapped/C_iglgryfd net/minecraft/client/render/block/entity
FIELD f_uarjgxea entityRendererDispatcher Lnet/minecraft/unmapped/C_gmkqxljo;
METHOD <init> (Lnet/minecraft/unmapped/C_zeyvbzzx$C_rdyueyua;)V
ARG 1 ctx
METHOD m_faiduebl (FLnet/minecraft/unmapped/C_cnszsxvd;Lnet/minecraft/unmapped/C_igrgeffe;ILnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_gmkqxljo;DD)V
METHOD m_faiduebl renderSpinningEntity (FLnet/minecraft/unmapped/C_cnszsxvd;Lnet/minecraft/unmapped/C_igrgeffe;ILnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_gmkqxljo;DD)V
ARG 0 delta
ARG 3 light
ARG 4 entity
ARG 5 renderDispatcher
ARG 6 start
ARG 8 end
ARG 6 prevRotation
ARG 8 rotation
27 changes: 27 additions & 0 deletions mappings/net/minecraft/world/EntityDetector.mapping
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
CLASS net/minecraft/unmapped/C_kkiexczn net/minecraft/world/EntityDetector
FIELD f_etrsolop NON_CREATIVE_NON_SPECTATOR_PLAYERS Lnet/minecraft/unmapped/C_kkiexczn;
FIELD f_hkridops SHEEP Lnet/minecraft/unmapped/C_kkiexczn;
FIELD f_yumifdey NON_SPECTATING_PLAYERS Lnet/minecraft/unmapped/C_kkiexczn;
METHOD detect detect (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_kkiexczn$C_ztluwxut;Lnet/minecraft/unmapped/C_hynzadkk;D)Ljava/util/List;
ARG 2 selector
ARG 4 range
METHOD m_bappuynt (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_kkiexczn$C_ztluwxut;Lnet/minecraft/unmapped/C_hynzadkk;D)Ljava/util/List;
ARG 1 selector
ARG 3 range
METHOD m_geuazetv (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_kkiexczn$C_ztluwxut;Lnet/minecraft/unmapped/C_hynzadkk;D)Ljava/util/List;
ARG 1 selector
ARG 3 range
METHOD m_rfaxpdqf (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_kkiexczn$C_ztluwxut;Lnet/minecraft/unmapped/C_hynzadkk;D)Ljava/util/List;
ARG 1 selector
ARG 3 range
CLASS C_ztluwxut EntitySelector
FIELD f_upomikid WORLD_ENTITY_SELECTOR Lnet/minecraft/unmapped/C_kkiexczn$C_ztluwxut;
METHOD m_koxvcyge selectPlayers (Lnet/minecraft/unmapped/C_bdwnwhiu;Ljava/util/function/Predicate;)Ljava/util/List;
ARG 2 predicate
METHOD m_suxeubdv onlySelectPlayers (Ljava/util/List;)Lnet/minecraft/unmapped/C_kkiexczn$C_ztluwxut;
ARG 0 players
METHOD m_vhemyunb onlySelectPlayer (Lnet/minecraft/unmapped/C_jzrpycqo;)Lnet/minecraft/unmapped/C_kkiexczn$C_ztluwxut;
METHOD m_wyjihabd selectByType (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_ocpldaah;Lnet/minecraft/unmapped/C_hbcjzgoe;Ljava/util/function/Predicate;)Ljava/util/List;
ARG 2 typeFilter
ARG 3 detectionBox
ARG 4 entityPredicate
1 change: 1 addition & 0 deletions mappings/net/minecraft/world/MobSpawnerEntry.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ CLASS net/minecraft/unmapped/C_edcjbljn net/minecraft/world/MobSpawnerEntry
ARG 0 instance
METHOD m_hqvizrhc (Lnet/minecraft/unmapped/C_edcjbljn$C_jzmzunnv;)Lnet/minecraft/unmapped/C_uydqwobg;
ARG 0 rules
METHOD m_oafnehiw canSpawn (Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_bdwnwhiu;)Z
METHOD m_onmagaow validate (Ljava/lang/String;)Lcom/mojang/serialization/MapCodec;
ARG 0 id
METHOD m_onzhgifd validate (Lnet/minecraft/unmapped/C_uydqwobg;)Lcom/mojang/serialization/DataResult;
Expand Down
48 changes: 48 additions & 0 deletions mappings/net/minecraft/world/TrialSpawnerLogic.mapping
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
CLASS net/minecraft/unmapped/C_jelkcvqk net/minecraft/world/TrialSpawnerLogic
FIELD f_byggmrue playerDetector Lnet/minecraft/unmapped/C_kkiexczn;
FIELD f_culvqbdv config Lnet/minecraft/unmapped/C_pocjjnjk;
FIELD f_cyizsevm AMBIENT_SOUND_CHANCE F
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_rqyxrnno playerDetectionSelector Lnet/minecraft/unmapped/C_kkiexczn$C_ztluwxut;
FIELD f_sobdyvtw MAX_MOB_TRACKING_RANGE I
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;)V
METHOD m_bfmdqsfz getPlayerDetector ()Lnet/minecraft/unmapped/C_kkiexczn;
METHOD m_bftllosi tickClient (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;)V
METHOD m_dalhosuv addEjectItemParticles (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_rlomrsco;)V
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_kxkfzuix;)Lnet/minecraft/unmapped/C_jelkcvqk;
ARG 1 config
ARG 2 data
METHOD m_ggqvmzns ejectLoot (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_ncpywfca;)V
ARG 3 lootTableId
METHOD m_gtgamtxz getState ()Lnet/minecraft/unmapped/C_mefvrcdp;
METHOD m_hvfivtpr getCodec ()Lcom/mojang/serialization/Codec;
METHOD m_jioxfpfu (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
ARG 1 instance
METHOD m_kdobayrz forceSpawning ()V
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;)V
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_wubotvnx addDetectionParticles (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_rlomrsco;I)V
ARG 3 detectedPlayers
METHOD m_wujvpyvr setPlayerDetector (Lnet/minecraft/unmapped/C_kkiexczn;)V
ARG 1 playerDetector
METHOD m_xxjyblvm getConfig ()Lnet/minecraft/unmapped/C_pocjjnjk;
METHOD m_ykbnfxwa getPlayerDetectionSelector ()Lnet/minecraft/unmapped/C_kkiexczn$C_ztluwxut;
METHOD m_yrnnsguk shouldRemoveMobFromData (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_hynzadkk;Ljava/util/UUID;)Z
METHOD m_zmvyuvfy updateListeners ()V
CLASS C_onmhuuws TrialSpawner
METHOD m_khbvxtru getState ()Lnet/minecraft/unmapped/C_mefvrcdp;
METHOD m_qubjusrv setState (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_mefvrcdp;)V
ARG 2 state
METHOD m_wvpnseil updateListeners ()V

1 comment on commit 50d9bbf

@github-actions
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With commit 50d9bbf, 24 file(s) were updated with 257 line(s) added and 233 removed compared to the latest Quilt Mappings version.

View the diff here: 
diff -bur namedTargetSrc/net/minecraft/block/Blocks.java namedSrc/net/minecraft/block/Blocks.java
--- namedTargetSrc/net/minecraft/block/Blocks.java	2024-02-06 22:39:23.428678822 +0000
+++ namedSrc/net/minecraft/block/Blocks.java	2024-02-06 22:38:09.988651839 +0000
@@ -11483,7 +11483,7 @@
             .mapColor(MapColor.STONE)
             .instrument(NoteBlockInstrument.BASEDRUM)
             .requiresTool()
-            .luminance(state -> ((TrialSpawnerState)state.get(C_qiypfnai.f_eqxijsod)).m_cdvvkjen())
+            .luminance(state -> ((TrialSpawnerState)state.get(C_qiypfnai.f_eqxijsod)).getLuminance())
             .strength(50.0F)
             .sounds(BlockSoundGroup.BLOCK_TRIAL_SPAWNER_BREAK)
             .blockVision(Blocks::nonSolid)
diff -bur namedTargetSrc/net/minecraft/block/entity/MobSpawnerBlockEntity.java namedSrc/net/minecraft/block/entity/MobSpawnerBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/MobSpawnerBlockEntity.java	2024-02-06 22:39:23.444678828 +0000
+++ namedSrc/net/minecraft/block/entity/MobSpawnerBlockEntity.java	2024-02-06 22:38:10.008651846 +0000
@@ -3,12 +3,12 @@
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.Blocks;
+import net.minecraft.block.Spawner;
 import net.minecraft.entity.EntityType;
 import net.minecraft.nbt.NbtCompound;
 import net.minecraft.network.packet.s2c.play.BlockEntityUpdateS2CPacket;
 import net.minecraft.registry.HolderLookup;
 import net.minecraft.server.world.ServerWorld;
-import net.minecraft.unmapped.C_xheeywhc;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.random.RandomGenerator;
 import net.minecraft.world.MobSpawnerEntry;
@@ -20,7 +20,7 @@
  * @mapping {@literal hashed net/minecraft/unmapped/C_qtiirvxr}
  * @mapping {@literal named net/minecraft/block/entity/MobSpawnerBlockEntity}
  */
-public class MobSpawnerBlockEntity extends BlockEntity implements C_xheeywhc {
+public class MobSpawnerBlockEntity extends BlockEntity implements Spawner {
    /**
     * @mapping {@literal hashed f_hdywupga Lnet/minecraft/unmapped/C_qtiirvxr;f_hdywupga:Lnet/minecraft/unmapped/C_pyejmcbw;}
     * @mapping {@literal named logic Lnet/minecraft/block/entity/MobSpawnerBlockEntity;logic:Lnet/minecraft/world/MobSpawnerLogic;}
@@ -124,12 +124,11 @@
    }
 
    /**
-    * @mapping {@literal hashed m_aohplshh Lnet/minecraft/unmapped/C_qtiirvxr;m_aohplshh(Lnet/minecraft/unmapped/C_ogavsvbr;Lnet/minecraft/unmapped/C_rlomrsco;)V}
-    * @mapping {@literal named m_aohplshh Lnet/minecraft/block/entity/MobSpawnerBlockEntity;m_aohplshh(Lnet/minecraft/entity/EntityType;Lnet/minecraft/util/random/RandomGenerator;)V}
+    * Mapping not found
     */
    @Override
-   public void m_aohplshh(EntityType<?> arg, RandomGenerator random) {
-      this.logic.setEntityId(arg, this.world, random, this.pos);
+   public void setEntityType(EntityType<?> entityType, RandomGenerator random) {
+      this.logic.setEntityId(entityType, this.world, random, this.pos);
       this.markDirty();
    }
 
diff -bur namedTargetSrc/net/minecraft/block/entity/TrialSpawnerBlockEntity.java namedSrc/net/minecraft/block/entity/TrialSpawnerBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/TrialSpawnerBlockEntity.java	2024-02-06 22:39:23.564678866 +0000
+++ namedSrc/net/minecraft/block/entity/TrialSpawnerBlockEntity.java	2024-02-06 22:38:10.140651893 +0000
@@ -3,6 +3,7 @@
 import com.mojang.logging.LogUtils;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
+import net.minecraft.block.Spawner;
 import net.minecraft.block.enums.TrialSpawnerState;
 import net.minecraft.entity.EntityType;
 import net.minecraft.nbt.NbtCompound;
@@ -10,12 +11,11 @@
 import net.minecraft.network.packet.s2c.play.BlockEntityUpdateS2CPacket;
 import net.minecraft.registry.HolderLookup;
 import net.minecraft.state.property.Properties;
-import net.minecraft.unmapped.C_jelkcvqk;
-import net.minecraft.unmapped.C_kkiexczn;
 import net.minecraft.unmapped.C_qiypfnai;
-import net.minecraft.unmapped.C_xheeywhc;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.random.RandomGenerator;
+import net.minecraft.world.EntityDetector;
+import net.minecraft.world.TrialSpawnerLogic;
 import net.minecraft.world.World;
 import org.slf4j.Logger;
 
@@ -23,16 +23,17 @@
  * @mapping {@literal hashed net/minecraft/unmapped/C_ndgqjckh}
  * @mapping {@literal named net/minecraft/block/entity/TrialSpawnerBlockEntity}
  */
-public class TrialSpawnerBlockEntity extends BlockEntity implements C_xheeywhc, C_jelkcvqk.C_onmhuuws {
+public class TrialSpawnerBlockEntity extends BlockEntity implements Spawner, TrialSpawnerLogic.TrialSpawner {
    /**
     * @mapping {@literal hashed f_dnhjtuzr Lnet/minecraft/unmapped/C_ndgqjckh;f_dnhjtuzr:Lorg/slf4j/Logger;}
     * @mapping {@literal named LOGGER Lnet/minecraft/block/entity/TrialSpawnerBlockEntity;LOGGER:Lorg/slf4j/Logger;}
     */
    private static final Logger LOGGER = LogUtils.getLogger();
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_fhtosxqw Lnet/minecraft/unmapped/C_ndgqjckh;f_fhtosxqw:Lnet/minecraft/unmapped/C_jelkcvqk;}
+    * @mapping {@literal named spawnerLogic Lnet/minecraft/block/entity/TrialSpawnerBlockEntity;spawnerLogic:Lnet/minecraft/world/TrialSpawnerLogic;}
     */
-   private C_jelkcvqk f_fhtosxqw;
+   private TrialSpawnerLogic spawnerLogic;
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_ndgqjckh;<init>(Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;)V}
@@ -40,9 +41,9 @@
     */
    public TrialSpawnerBlockEntity(BlockPos pos, BlockState state) {
       super(BlockEntityType.TRIAL_SPAWNER, pos, state);
-      C_kkiexczn lv = C_kkiexczn.f_etrsolop;
-      C_kkiexczn.C_ztluwxut lv2 = C_kkiexczn.C_ztluwxut.f_upomikid;
-      this.f_fhtosxqw = new C_jelkcvqk(this, lv, lv2);
+      EntityDetector lv = EntityDetector.NON_CREATIVE_NON_SPECTATOR_PLAYERS;
+      EntityDetector.EntitySelector lv2 = EntityDetector.EntitySelector.WORLD_ENTITY_SELECTOR;
+      this.spawnerLogic = new TrialSpawnerLogic(this, lv, lv2);
    }
 
    /**
@@ -51,9 +52,9 @@
    @Override
    public void readNbt(NbtCompound nbt, HolderLookup.Provider arg2) {
       super.readNbt(nbt, arg2);
-      this.f_fhtosxqw.m_hvfivtpr().parse(NbtOps.INSTANCE, nbt).resultOrPartial(LOGGER::error).ifPresent(arg -> this.f_fhtosxqw = arg);
+      this.spawnerLogic.getCodec().parse(NbtOps.INSTANCE, nbt).resultOrPartial(LOGGER::error).ifPresent(logic -> this.spawnerLogic = logic);
       if (this.world != null) {
-         this.m_wvpnseil();
+         this.updateListeners();
       }
    }
 
@@ -63,12 +64,12 @@
    @Override
    protected void writeNbt(NbtCompound nbt, HolderLookup.Provider arg2) {
       super.writeNbt(nbt, arg2);
-      this.f_fhtosxqw
-         .m_hvfivtpr()
-         .encodeStart(NbtOps.INSTANCE, this.f_fhtosxqw)
+      this.spawnerLogic
+         .getCodec()
+         .encodeStart(NbtOps.INSTANCE, this.spawnerLogic)
          .get()
-         .ifLeft(arg2x -> nbt.copyFrom((NbtCompound)arg2x))
-         .ifRight(partialResult -> LOGGER.warn("Failed to encode TrialSpawner {}", partialResult.message()));
+         .ifLeft(logicNbt -> nbt.copyFrom((NbtCompound)logicNbt))
+         .ifRight(error -> LOGGER.warn("Failed to encode TrialSpawner {}", error.message()));
    }
 
    /**
@@ -84,7 +85,7 @@
     */
    @Override
    public NbtCompound toSyncedNbt(HolderLookup.Provider arg) {
-      return this.f_fhtosxqw.m_uohhenov().m_nfqmvsor(this.getCachedState().get(C_qiypfnai.f_eqxijsod));
+      return this.spawnerLogic.getData().getSyncedNbt(this.getCachedState().get(C_qiypfnai.f_eqxijsod));
    }
 
    /**
@@ -96,47 +97,46 @@
    }
 
    /**
-    * @mapping {@literal hashed m_aohplshh Lnet/minecraft/unmapped/C_ndgqjckh;m_aohplshh(Lnet/minecraft/unmapped/C_ogavsvbr;Lnet/minecraft/unmapped/C_rlomrsco;)V}
-    * @mapping {@literal named m_aohplshh Lnet/minecraft/block/entity/TrialSpawnerBlockEntity;m_aohplshh(Lnet/minecraft/entity/EntityType;Lnet/minecraft/util/random/RandomGenerator;)V}
+    * Mapping not found
     */
    @Override
-   public void m_aohplshh(EntityType<?> arg, RandomGenerator random) {
-      this.f_fhtosxqw.m_uohhenov().m_sccvkbao(this.f_fhtosxqw, random, arg);
+   public void setEntityType(EntityType<?> entityType, RandomGenerator random) {
+      this.spawnerLogic.getData().setEntityType(this.spawnerLogic, random, entityType);
       this.markDirty();
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_wvhkrgdu Lnet/minecraft/unmapped/C_ndgqjckh;m_wvhkrgdu()Lnet/minecraft/unmapped/C_jelkcvqk;}
+    * @mapping {@literal named getSpawnerLogic Lnet/minecraft/block/entity/TrialSpawnerBlockEntity;getSpawnerLogic()Lnet/minecraft/world/TrialSpawnerLogic;}
     */
-   public C_jelkcvqk m_wvhkrgdu() {
-      return this.f_fhtosxqw;
+   public TrialSpawnerLogic getSpawnerLogic() {
+      return this.spawnerLogic;
    }
 
    /**
     * Mapping not found
     */
    @Override
-   public TrialSpawnerState m_khbvxtru() {
+   public TrialSpawnerState getState() {
       return !this.getCachedState().contains(Properties.TRIAL_SPAWNER_STATE)
          ? TrialSpawnerState.INACTIVE
          : this.getCachedState().get(Properties.TRIAL_SPAWNER_STATE);
    }
 
    /**
-    * @mapping {@literal hashed m_qubjusrv Lnet/minecraft/unmapped/C_ndgqjckh;m_qubjusrv(Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_mefvrcdp;)V}
-    * @mapping {@literal named m_qubjusrv Lnet/minecraft/block/entity/TrialSpawnerBlockEntity;m_qubjusrv(Lnet/minecraft/world/World;Lnet/minecraft/block/enums/TrialSpawnerState;)V}
+    * Mapping not found
     */
    @Override
-   public void m_qubjusrv(World world, TrialSpawnerState arg2) {
+   public void setState(World world, TrialSpawnerState state) {
       this.markDirty();
-      world.setBlockState(this.pos, this.getCachedState().with(Properties.TRIAL_SPAWNER_STATE, arg2));
+      world.setBlockState(this.pos, this.getCachedState().with(Properties.TRIAL_SPAWNER_STATE, state));
    }
 
    /**
     * Mapping not found
     */
    @Override
-   public void m_wvpnseil() {
+   public void updateListeners() {
       this.markDirty();
       if (this.world != null) {
          this.world.updateListeners(this.pos, this.getCachedState(), this.getCachedState(), Block.NOTIFY_ALL);
diff -bur namedTargetSrc/net/minecraft/block/enums/TrialSpawnerState.java namedSrc/net/minecraft/block/enums/TrialSpawnerState.java
--- namedTargetSrc/net/minecraft/block/enums/TrialSpawnerState.java	2024-02-06 22:39:23.596678877 +0000
+++ namedSrc/net/minecraft/block/enums/TrialSpawnerState.java	2024-02-06 22:38:10.172651904 +0000
@@ -1,21 +1,21 @@
 package net.minecraft.block.enums;
 
 import java.util.Optional;
+import net.minecraft.block.TrialSpawnerConfig;
+import net.minecraft.block.TrialSpawnerData;
 import net.minecraft.particle.DefaultParticleType;
 import net.minecraft.particle.ParticleTypes;
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.sound.SoundCategory;
 import net.minecraft.sound.SoundEvents;
-import net.minecraft.unmapped.C_jelkcvqk;
-import net.minecraft.unmapped.C_kkiexczn;
-import net.minecraft.unmapped.C_kxkfzuix;
-import net.minecraft.unmapped.C_pocjjnjk;
 import net.minecraft.util.StringIdentifiable;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.util.random.RandomGenerator;
+import net.minecraft.world.EntityDetector;
 import net.minecraft.world.MobSpawnerEntry;
+import net.minecraft.world.TrialSpawnerLogic;
 import net.minecraft.world.World;
 
 /**
@@ -27,117 +27,125 @@
     * @mapping {@literal hashed f_tvtbxuax Lnet/minecraft/unmapped/C_mefvrcdp;f_tvtbxuax:Lnet/minecraft/unmapped/C_mefvrcdp;}
     * @mapping {@literal named INACTIVE Lnet/minecraft/block/enums/TrialSpawnerState;INACTIVE:Lnet/minecraft/block/enums/TrialSpawnerState;}
     */
-   INACTIVE("inactive", 0, TrialSpawnerState.C_bccyitsl.f_fqijyvaw, -1.0, false),
+   INACTIVE("inactive", 0, TrialSpawnerState.ParticleEmitter.NONE, -1.0, false),
    /**
     * @mapping {@literal hashed f_ktinwycx Lnet/minecraft/unmapped/C_mefvrcdp;f_ktinwycx:Lnet/minecraft/unmapped/C_mefvrcdp;}
     * @mapping {@literal named WAITING_FOR_PLAYERS Lnet/minecraft/block/enums/TrialSpawnerState;WAITING_FOR_PLAYERS:Lnet/minecraft/block/enums/TrialSpawnerState;}
     */
-   WAITING_FOR_PLAYERS("waiting_for_players", 4, TrialSpawnerState.C_bccyitsl.f_niudltvq, 200.0, true),
+   WAITING_FOR_PLAYERS("waiting_for_players", 4, TrialSpawnerState.ParticleEmitter.WAITING, 200.0, true),
    /**
     * @mapping {@literal hashed f_iqghkjqp Lnet/minecraft/unmapped/C_mefvrcdp;f_iqghkjqp:Lnet/minecraft/unmapped/C_mefvrcdp;}
     * @mapping {@literal named ACTIVE Lnet/minecraft/block/enums/TrialSpawnerState;ACTIVE:Lnet/minecraft/block/enums/TrialSpawnerState;}
     */
-   ACTIVE("active", 8, TrialSpawnerState.C_bccyitsl.f_ibbxvdpf, 1000.0, true),
+   ACTIVE("active", 8, TrialSpawnerState.ParticleEmitter.ACTIVE, 1000.0, true),
    /**
     * @mapping {@literal hashed f_abkbnpup Lnet/minecraft/unmapped/C_mefvrcdp;f_abkbnpup:Lnet/minecraft/unmapped/C_mefvrcdp;}
     * @mapping {@literal named WAITING_FOR_REWARD_EJECTION Lnet/minecraft/block/enums/TrialSpawnerState;WAITING_FOR_REWARD_EJECTION:Lnet/minecraft/block/enums/TrialSpawnerState;}
     */
-   WAITING_FOR_REWARD_EJECTION("waiting_for_reward_ejection", 8, TrialSpawnerState.C_bccyitsl.f_niudltvq, -1.0, false),
+   WAITING_FOR_REWARD_EJECTION("waiting_for_reward_ejection", 8, TrialSpawnerState.ParticleEmitter.WAITING, -1.0, false),
    /**
     * @mapping {@literal hashed f_mbsfnwru Lnet/minecraft/unmapped/C_mefvrcdp;f_mbsfnwru:Lnet/minecraft/unmapped/C_mefvrcdp;}
     * @mapping {@literal named EJECTING_REWARD Lnet/minecraft/block/enums/TrialSpawnerState;EJECTING_REWARD:Lnet/minecraft/block/enums/TrialSpawnerState;}
     */
-   EJECTING_REWARD("ejecting_reward", 8, TrialSpawnerState.C_bccyitsl.f_niudltvq, -1.0, false),
+   EJECTING_REWARD("ejecting_reward", 8, TrialSpawnerState.ParticleEmitter.WAITING, -1.0, false),
    /**
     * @mapping {@literal hashed f_fazsykji Lnet/minecraft/unmapped/C_mefvrcdp;f_fazsykji:Lnet/minecraft/unmapped/C_mefvrcdp;}
     * @mapping {@literal named COOLDOWN Lnet/minecraft/block/enums/TrialSpawnerState;COOLDOWN:Lnet/minecraft/block/enums/TrialSpawnerState;}
     */
-   COOLDOWN("cooldown", 0, TrialSpawnerState.C_bccyitsl.f_kjgegjdt, -1.0, false);
+   COOLDOWN("cooldown", 0, TrialSpawnerState.ParticleEmitter.COOLDOWN, -1.0, false);
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_vmdjvapc Lnet/minecraft/unmapped/C_mefvrcdp;f_vmdjvapc:F}
+    * @mapping {@literal named SHUTTER_OPENING_DELAY Lnet/minecraft/block/enums/TrialSpawnerState;SHUTTER_OPENING_DELAY:F}
     */
-   private static final float f_vmdjvapc = 40.0F;
+   private static final float SHUTTER_OPENING_DELAY = 40.0F;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_ujehhhbc Lnet/minecraft/unmapped/C_mefvrcdp;f_ujehhhbc:I}
+    * @mapping {@literal named REWARD_EJECTION_DELAY Lnet/minecraft/block/enums/TrialSpawnerState;REWARD_EJECTION_DELAY:I}
     */
-   private static final int f_ujehhhbc = MathHelper.floor(30.0F);
+   private static final int REWARD_EJECTION_DELAY = MathHelper.floor(30.0F);
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_vlliqbyk Lnet/minecraft/unmapped/C_mefvrcdp;f_vlliqbyk:Ljava/lang/String;}
+    * @mapping {@literal named name Lnet/minecraft/block/enums/TrialSpawnerState;name:Ljava/lang/String;}
     */
-   private final String f_vlliqbyk;
+   private final String name;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_mgbthnrg Lnet/minecraft/unmapped/C_mefvrcdp;f_mgbthnrg:I}
+    * @mapping {@literal named luminance Lnet/minecraft/block/enums/TrialSpawnerState;luminance:I}
     */
-   private final int f_mgbthnrg;
+   private final int luminance;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_eszkuyea Lnet/minecraft/unmapped/C_mefvrcdp;f_eszkuyea:D}
+    * @mapping {@literal named entityRotationSpeed Lnet/minecraft/block/enums/TrialSpawnerState;entityRotationSpeed:D}
     */
-   private final double f_eszkuyea;
+   private final double entityRotationSpeed;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_cvmyynjl Lnet/minecraft/unmapped/C_mefvrcdp;f_cvmyynjl:Lnet/minecraft/unmapped/C_mefvrcdp$C_bccyitsl;}
+    * @mapping {@literal named particleEmitter Lnet/minecraft/block/enums/TrialSpawnerState;particleEmitter:Lnet/minecraft/block/enums/TrialSpawnerState$ParticleEmitter;}
     */
-   private final TrialSpawnerState.C_bccyitsl f_cvmyynjl;
+   private final TrialSpawnerState.ParticleEmitter particleEmitter;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_swntygwn Lnet/minecraft/unmapped/C_mefvrcdp;f_swntygwn:Z}
+    * @mapping {@literal named spawnCapable Lnet/minecraft/block/enums/TrialSpawnerState;spawnCapable:Z}
     */
-   private final boolean f_swntygwn;
+   private final boolean spawnCapable;
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_mefvrcdp;<init>(Ljava/lang/String;ILjava/lang/String;ILnet/minecraft/unmapped/C_mefvrcdp$C_bccyitsl;DZ)V}
+    * @mapping {@literal named <init> Lnet/minecraft/block/enums/TrialSpawnerState;<init>(Ljava/lang/String;ILjava/lang/String;ILnet/minecraft/block/enums/TrialSpawnerState$ParticleEmitter;DZ)V}
     */
-   private TrialSpawnerState(String string2, int j, TrialSpawnerState.C_bccyitsl arg, double d, boolean bl) {
-      this.f_vlliqbyk = string2;
-      this.f_mgbthnrg = j;
-      this.f_cvmyynjl = arg;
-      this.f_eszkuyea = d;
-      this.f_swntygwn = bl;
+   private TrialSpawnerState(String name, int luminance, TrialSpawnerState.ParticleEmitter particleEmitter, double entityRotationSpeed, boolean spawnCapable) {
+      this.name = name;
+      this.luminance = luminance;
+      this.particleEmitter = particleEmitter;
+      this.entityRotationSpeed = entityRotationSpeed;
+      this.spawnCapable = spawnCapable;
    }
 
    /**
     * @mapping {@literal hashed m_bkyjhsim Lnet/minecraft/unmapped/C_mefvrcdp;m_bkyjhsim(Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_jelkcvqk;Lnet/minecraft/unmapped/C_bdwnwhiu;)Lnet/minecraft/unmapped/C_mefvrcdp;}
-    * @mapping {@literal named m_bkyjhsim Lnet/minecraft/block/enums/TrialSpawnerState;m_bkyjhsim(Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/unmapped/C_jelkcvqk;Lnet/minecraft/server/world/ServerWorld;)Lnet/minecraft/block/enums/TrialSpawnerState;}
+    * @mapping {@literal named tick Lnet/minecraft/block/enums/TrialSpawnerState;tick(Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/world/TrialSpawnerLogic;Lnet/minecraft/server/world/ServerWorld;)Lnet/minecraft/block/enums/TrialSpawnerState;}
     */
-   TrialSpawnerState m_bkyjhsim(BlockPos pos, C_jelkcvqk arg2, ServerWorld world) {
-      C_kxkfzuix lv = arg2.m_uohhenov();
-      C_pocjjnjk lv2 = arg2.m_xxjyblvm();
-      C_kkiexczn lv3 = arg2.m_bfmdqsfz();
-      C_kkiexczn.C_ztluwxut lv4 = arg2.m_ykbnfxwa();
+   TrialSpawnerState tick(BlockPos pos, TrialSpawnerLogic spawnerLogic, ServerWorld world) {
+      TrialSpawnerData lv = spawnerLogic.getData();
+      TrialSpawnerConfig lv2 = spawnerLogic.getConfig();
+      EntityDetector lv3 = spawnerLogic.getPlayerDetector();
+      EntityDetector.EntitySelector lv4 = spawnerLogic.getPlayerDetectionSelector();
       TrialSpawnerState var10000;
       switch (this) {
          case INACTIVE:
-            var10000 = lv.m_mnonaikc(arg2, world, WAITING_FOR_PLAYERS) == null ? this : WAITING_FOR_PLAYERS;
+            var10000 = lv.getOrCreateDisplayEntity(spawnerLogic, world, WAITING_FOR_PLAYERS) == null ? this : WAITING_FOR_PLAYERS;
             break;
          case WAITING_FOR_PLAYERS:
-            if (!lv.m_lqfpmalh()) {
+            if (!lv.hasSpawnData()) {
                var10000 = INACTIVE;
             } else {
-               lv.m_hqnuaozt(world, pos, lv3, lv4, lv2.requiredPlayerRange());
+               lv.detectPlayers(world, pos, lv3, lv4, lv2.requiredPlayerRange());
                var10000 = lv.registeredPlayers.isEmpty() ? this : ACTIVE;
             }
             break;
          case ACTIVE:
-            if (!lv.m_lqfpmalh()) {
+            if (!lv.hasSpawnData()) {
                var10000 = INACTIVE;
             } else {
-               int i = lv.m_ncimrtbx(pos);
-               lv.m_hqnuaozt(world, pos, lv3, lv4, lv2.requiredPlayerRange());
-               if (lv.m_rdtrxuhq(lv2, i)) {
-                  if (lv.m_lptaqeuw()) {
-                     lv.cooldownEndsAt = world.getTime() + (long)lv2.targetCooldownLength();
+               int i = lv.getAdditionalPlayers(pos);
+               lv.detectPlayers(world, pos, lv3, lv4, lv2.requiredPlayerRange());
+               if (lv.hasSpawnedAllMobs(lv2, i)) {
+                  if (lv.areMobsDead()) {
+                     lv.cooldownEndTime = world.getTime() + (long)lv2.targetCooldownLength();
                      lv.totalMobsSpawned = 0;
-                     lv.nextMobSpawnsAt = 0L;
+                     lv.nextMobSpawnTime = 0L;
                      var10000 = WAITING_FOR_REWARD_EJECTION;
                      break;
                   }
-               } else if (lv.m_npuvzoxl(world, lv2, i)) {
-                  arg2.m_aakzgwdf(world, pos).ifPresent(uuid -> {
+               } else if (lv.isReadyToSpawnNewMobs(world, lv2, i)) {
+                  spawnerLogic.spawnMob(world, pos).ifPresent(uuid -> {
                      lv.currentMobs.add(uuid);
                      lv.totalMobsSpawned++;
-                     lv.nextMobSpawnsAt = world.getTime() + (long)lv2.ticksBetweenSpawn();
-                     lv.f_tlbkcemq.getOrEmpty(world.getRandom()).ifPresent(arg3x -> {
-                        lv.spawnData = Optional.of((MobSpawnerEntry)arg3x.getData());
-                        arg2.m_zmvyuvfy();
+                     lv.nextMobSpawnTime = world.getTime() + (long)lv2.ticksBetweenSpawn();
+                     lv.spawnDataPool.getOrEmpty(world.getRandom()).ifPresent(spawnData -> {
+                        lv.spawnData = Optional.of((MobSpawnerEntry)spawnData.getData());
+                        spawnerLogic.updateListeners();
                      });
                   });
                }
@@ -146,7 +154,7 @@
             }
             break;
          case WAITING_FOR_REWARD_EJECTION:
-            if (lv.m_phbcnwhj(world, lv2, 40.0F)) {
+            if (lv.isReadyToOpenShutter(world, lv2, 40.0F)) {
                world.playSound(null, pos, SoundEvents.BLOCK_TRIAL_SPAWNER_OPEN_SHUTTER, SoundCategory.BLOCKS);
                var10000 = EJECTING_REWARD;
             } else {
@@ -154,7 +162,7 @@
             }
             break;
          case EJECTING_REWARD:
-            if (!lv.m_kjmtebfw(world, lv2, (float)f_ujehhhbc)) {
+            if (!lv.isReadyToEjectReward(world, lv2, (float)REWARD_EJECTION_DELAY)) {
                var10000 = this;
             } else if (lv.registeredPlayers.isEmpty()) {
                world.playSound(null, pos, SoundEvents.BLOCK_TRIAL_SPAWNER_CLOSE_SHUTTER, SoundCategory.BLOCKS);
@@ -165,14 +173,14 @@
                   lv.ejectingLootTable = lv2.lootTablesToEject().getDataOrEmpty(world.getRandom());
                }
 
-               lv.ejectingLootTable.ifPresent(arg4 -> arg2.m_ggqvmzns(world, pos, arg4));
+               lv.ejectingLootTable.ifPresent(lootTable -> spawnerLogic.ejectLoot(world, pos, lootTable));
                lv.registeredPlayers.remove(lv.registeredPlayers.iterator().next());
                var10000 = this;
             }
             break;
          case COOLDOWN:
-            if (lv.m_xhldgvye(world)) {
-               lv.cooldownEndsAt = 0L;
+            if (lv.isCooldownFinished(world)) {
+               lv.cooldownEndTime = 0L;
                var10000 = WAITING_FOR_PLAYERS;
             } else {
                var10000 = this;
@@ -186,39 +194,43 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_cdvvkjen Lnet/minecraft/unmapped/C_mefvrcdp;m_cdvvkjen()I}
+    * @mapping {@literal named getLuminance Lnet/minecraft/block/enums/TrialSpawnerState;getLuminance()I}
     */
-   public int m_cdvvkjen() {
-      return this.f_mgbthnrg;
+   public int getLuminance() {
+      return this.luminance;
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_bakqsrqc Lnet/minecraft/unmapped/C_mefvrcdp;m_bakqsrqc()D}
+    * @mapping {@literal named getEntityRotationSpeed Lnet/minecraft/block/enums/TrialSpawnerState;getEntityRotationSpeed()D}
     */
-   public double m_bakqsrqc() {
-      return this.f_eszkuyea;
+   public double getEntityRotationSpeed() {
+      return this.entityRotationSpeed;
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_lbcodxhm Lnet/minecraft/unmapped/C_mefvrcdp;m_lbcodxhm()Z}
+    * @mapping {@literal named hasRotatingEntity Lnet/minecraft/block/enums/TrialSpawnerState;hasRotatingEntity()Z}
     */
-   public boolean m_lbcodxhm() {
-      return this.f_eszkuyea >= 0.0;
+   public boolean hasRotatingEntity() {
+      return this.entityRotationSpeed >= 0.0;
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_ucdxdqvw Lnet/minecraft/unmapped/C_mefvrcdp;m_ucdxdqvw()Z}
+    * @mapping {@literal named isCapableOfSpawning Lnet/minecraft/block/enums/TrialSpawnerState;isCapableOfSpawning()Z}
     */
-   public boolean m_ucdxdqvw() {
-      return this.f_swntygwn;
+   public boolean isCapableOfSpawning() {
+      return this.spawnCapable;
    }
 
    /**
     * @mapping {@literal hashed m_epcfmecd Lnet/minecraft/unmapped/C_mefvrcdp;m_epcfmecd(Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;)V}
-    * @mapping {@literal named m_epcfmecd Lnet/minecraft/block/enums/TrialSpawnerState;m_epcfmecd(Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;)V}
+    * @mapping {@literal named emitParticle Lnet/minecraft/block/enums/TrialSpawnerState;emitParticle(Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;)V}
     */
-   public void m_epcfmecd(World world, BlockPos pos) {
-      this.f_cvmyynjl.emit(world, world.getRandom(), pos);
+   public void emitParticle(World world, BlockPos pos) {
+      this.particleEmitter.emit(world, world.getRandom(), pos);
    }
 
    /**
@@ -226,117 +238,127 @@
     */
    @Override
    public String asString() {
-      return this.f_vlliqbyk;
+      return this.name;
    }
 
    /**
-    * @mapping {@literal hashed net/minecraft/unmapped/C_mefvrcdp$C_bccyitsl}
-    * @mapping {@literal named net/minecraft/block/enums/TrialSpawnerState$C_bccyitsl}
-    */
-   interface C_bccyitsl {
-      /**
-       * Mapping not found
+    * @mapping {@literal hashed net/minecraft/unmapped/C_mefvrcdp$C_vevghdwi}
+    * @mapping {@literal named net/minecraft/block/enums/TrialSpawnerState$DisplayEntityRotationSpeeds}
        */
-      TrialSpawnerState.C_bccyitsl f_fqijyvaw = (world, random, pos) -> {
-      };
+   static class DisplayEntityRotationSpeeds {
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_gljtrkmn Lnet/minecraft/unmapped/C_mefvrcdp$C_vevghdwi;f_gljtrkmn:D}
+       * @mapping {@literal named NONE Lnet/minecraft/block/enums/TrialSpawnerState$DisplayEntityRotationSpeeds;NONE:D}
        */
-      TrialSpawnerState.C_bccyitsl f_niudltvq = (world, random, pos) -> {
-         if (random.nextInt(2) == 0) {
-            Vec3d lv = pos.ofCenter().addRandom(random, 0.9F);
-            m_gdzvmyph(ParticleTypes.SMALL_FLAME, lv, world);
-         }
-      };
+      private static final double NONE = -1.0;
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_gauzfeiw Lnet/minecraft/unmapped/C_mefvrcdp$C_vevghdwi;f_gauzfeiw:D}
+       * @mapping {@literal named SLOW Lnet/minecraft/block/enums/TrialSpawnerState$DisplayEntityRotationSpeeds;SLOW:D}
        */
-      TrialSpawnerState.C_bccyitsl f_ibbxvdpf = (world, random, pos) -> {
-         Vec3d lv = pos.ofCenter().addRandom(random, 1.0F);
-         m_gdzvmyph(ParticleTypes.SMOKE, lv, world);
-         m_gdzvmyph(ParticleTypes.FLAME, lv, world);
-      };
+      private static final double SLOW = 200.0;
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_mscpicrf Lnet/minecraft/unmapped/C_mefvrcdp$C_vevghdwi;f_mscpicrf:D}
+       * @mapping {@literal named FAST Lnet/minecraft/block/enums/TrialSpawnerState$DisplayEntityRotationSpeeds;FAST:D}
        */
-      TrialSpawnerState.C_bccyitsl f_kjgegjdt = (world, random, pos) -> {
-         Vec3d lv = pos.ofCenter().addRandom(random, 0.9F);
-         if (random.nextInt(3) == 0) {
-            m_gdzvmyph(ParticleTypes.SMOKE, lv, world);
-         }
-
-         if (world.getTime() % 20L == 0L) {
-            Vec3d lv2 = pos.ofCenter().add(0.0, 0.5, 0.0);
-            int i = world.getRandom().nextInt(4) + 20;
-
-            for (int j = 0; j < i; j++) {
-               m_gdzvmyph(ParticleTypes.SMOKE, lv2, world);
-            }
-         }
-      };
+      private static final double FAST = 1000.0;
 
       /**
-       * @mapping {@literal hashed m_gdzvmyph Lnet/minecraft/unmapped/C_mefvrcdp$C_bccyitsl;m_gdzvmyph(Lnet/minecraft/unmapped/C_lwmufxcy;Lnet/minecraft/unmapped/C_vgpupfxx;Lnet/minecraft/unmapped/C_cdctfzbn;)V}
-       * @mapping {@literal named m_gdzvmyph Lnet/minecraft/block/enums/TrialSpawnerState$C_bccyitsl;m_gdzvmyph(Lnet/minecraft/particle/DefaultParticleType;Lnet/minecraft/util/math/Vec3d;Lnet/minecraft/world/World;)V}
+       * Mapping not found
        */
-      private static void m_gdzvmyph(DefaultParticleType arg, Vec3d arg2, World world) {
-         world.addParticle(arg, arg2.getX(), arg2.getY(), arg2.getZ(), 0.0, 0.0, 0.0);
+      private DisplayEntityRotationSpeeds() {
       }
-
-      /**
-       * @mapping {@literal hashed emit Lnet/minecraft/unmapped/C_mefvrcdp$C_bccyitsl;emit(Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_rlomrsco;Lnet/minecraft/unmapped/C_hynzadkk;)V}
-       * @mapping {@literal named emit Lnet/minecraft/block/enums/TrialSpawnerState$C_bccyitsl;emit(Lnet/minecraft/world/World;Lnet/minecraft/util/random/RandomGenerator;Lnet/minecraft/util/math/BlockPos;)V}
-       */
-      void emit(World world, RandomGenerator random, BlockPos pos);
    }
 
    /**
-    * @mapping {@literal hashed net/minecraft/unmapped/C_mefvrcdp$C_vevghdwi}
-    * @mapping {@literal named net/minecraft/block/enums/TrialSpawnerState$C_vevghdwi}
+    * @mapping {@literal hashed net/minecraft/unmapped/C_mefvrcdp$C_zwrttbii}
+    * @mapping {@literal named net/minecraft/block/enums/TrialSpawnerState$Luminance}
     */
-   static class C_vevghdwi {
+   static class Luminance {
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_ycxnnjlw Lnet/minecraft/unmapped/C_mefvrcdp$C_zwrttbii;f_ycxnnjlw:I}
+       * @mapping {@literal named NONE Lnet/minecraft/block/enums/TrialSpawnerState$Luminance;NONE:I}
        */
-      private static final double f_gljtrkmn = -1.0;
+      private static final int NONE = 0;
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_cmrzasvm Lnet/minecraft/unmapped/C_mefvrcdp$C_zwrttbii;f_cmrzasvm:I}
+       * @mapping {@literal named LOW Lnet/minecraft/block/enums/TrialSpawnerState$Luminance;LOW:I}
        */
-      private static final double f_gauzfeiw = 200.0;
+      private static final int LOW = 4;
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_cuofrvdp Lnet/minecraft/unmapped/C_mefvrcdp$C_zwrttbii;f_cuofrvdp:I}
+       * @mapping {@literal named HIGH Lnet/minecraft/block/enums/TrialSpawnerState$Luminance;HIGH:I}
        */
-      private static final double f_mscpicrf = 1000.0;
+      private static final int HIGH = 8;
 
       /**
        * Mapping not found
        */
-      private C_vevghdwi() {
+      private Luminance() {
       }
    }
 
    /**
-    * @mapping {@literal hashed net/minecraft/unmapped/C_mefvrcdp$C_zwrttbii}
-    * @mapping {@literal named net/minecraft/block/enums/TrialSpawnerState$C_zwrttbii}
+    * @mapping {@literal hashed net/minecraft/unmapped/C_mefvrcdp$C_bccyitsl}
+    * @mapping {@literal named net/minecraft/block/enums/TrialSpawnerState$ParticleEmitter}
     */
-   static class C_zwrttbii {
+   interface ParticleEmitter {
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_fqijyvaw Lnet/minecraft/unmapped/C_mefvrcdp$C_bccyitsl;f_fqijyvaw:Lnet/minecraft/unmapped/C_mefvrcdp$C_bccyitsl;}
+       * @mapping {@literal named NONE Lnet/minecraft/block/enums/TrialSpawnerState$ParticleEmitter;NONE:Lnet/minecraft/block/enums/TrialSpawnerState$ParticleEmitter;}
        */
-      private static final int f_ycxnnjlw = 0;
+      TrialSpawnerState.ParticleEmitter NONE = (world, random, pos) -> {
+      };
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_niudltvq Lnet/minecraft/unmapped/C_mefvrcdp$C_bccyitsl;f_niudltvq:Lnet/minecraft/unmapped/C_mefvrcdp$C_bccyitsl;}
+       * @mapping {@literal named WAITING Lnet/minecraft/block/enums/TrialSpawnerState$ParticleEmitter;WAITING:Lnet/minecraft/block/enums/TrialSpawnerState$ParticleEmitter;}
        */
-      private static final int f_cmrzasvm = 4;
+      TrialSpawnerState.ParticleEmitter WAITING = (world, random, pos) -> {
+         if (random.nextInt(2) == 0) {
+            Vec3d lv = pos.ofCenter().addRandom(random, 0.9F);
+            addParticle(ParticleTypes.SMALL_FLAME, lv, world);
+         }
+      };
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_ibbxvdpf Lnet/minecraft/unmapped/C_mefvrcdp$C_bccyitsl;f_ibbxvdpf:Lnet/minecraft/unmapped/C_mefvrcdp$C_bccyitsl;}
+       * @mapping {@literal named ACTIVE Lnet/minecraft/block/enums/TrialSpawnerState$ParticleEmitter;ACTIVE:Lnet/minecraft/block/enums/TrialSpawnerState$ParticleEmitter;}
+       */
+      TrialSpawnerState.ParticleEmitter ACTIVE = (world, random, pos) -> {
+         Vec3d lv = pos.ofCenter().addRandom(random, 1.0F);
+         addParticle(ParticleTypes.SMOKE, lv, world);
+         addParticle(ParticleTypes.FLAME, lv, world);
+      };
+      /**
+       * @mapping {@literal hashed f_kjgegjdt Lnet/minecraft/unmapped/C_mefvrcdp$C_bccyitsl;f_kjgegjdt:Lnet/minecraft/unmapped/C_mefvrcdp$C_bccyitsl;}
+       * @mapping {@literal named COOLDOWN Lnet/minecraft/block/enums/TrialSpawnerState$ParticleEmitter;COOLDOWN:Lnet/minecraft/block/enums/TrialSpawnerState$ParticleEmitter;}
        */
-      private static final int f_cuofrvdp = 8;
+      TrialSpawnerState.ParticleEmitter COOLDOWN = (world, random, pos) -> {
+         Vec3d lv = pos.ofCenter().addRandom(random, 0.9F);
+         if (random.nextInt(3) == 0) {
+            addParticle(ParticleTypes.SMOKE, lv, world);
+         }
+
+         if (world.getTime() % 20L == 0L) {
+            Vec3d lv2 = pos.ofCenter().add(0.0, 0.5, 0.0);
+            int i = world.getRandom().nextInt(4) + 20;
+
+            for (int j = 0; j < i; j++) {
+               addParticle(ParticleTypes.SMOKE, lv2, world);
+            }
+         }
+      };
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed m_gdzvmyph Lnet/minecraft/unmapped/C_mefvrcdp$C_bccyitsl;m_gdzvmyph(Lnet/minecraft/unmapped/C_lwmufxcy;Lnet/minecraft/unmapped/C_vgpupfxx;Lnet/minecraft/unmapped/C_cdctfzbn;)V}
+       * @mapping {@literal named addParticle Lnet/minecraft/block/enums/TrialSpawnerState$ParticleEmitter;addParticle(Lnet/minecraft/particle/DefaultParticleType;Lnet/minecraft/util/math/Vec3d;Lnet/minecraft/world/World;)V}
        */
-      private C_zwrttbii() {
+      private static void addParticle(DefaultParticleType particleType, Vec3d pos, World world) {
+         world.addParticle(particleType, pos.getX(), pos.getY(), pos.getZ(), 0.0, 0.0, 0.0);
       }
+
+      /**
+       * @mapping {@literal hashed emit Lnet/minecraft/unmapped/C_mefvrcdp$C_bccyitsl;emit(Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_rlomrsco;Lnet/minecraft/unmapped/C_hynzadkk;)V}
+       * @mapping {@literal named emit Lnet/minecraft/block/enums/TrialSpawnerState$ParticleEmitter;emit(Lnet/minecraft/world/World;Lnet/minecraft/util/random/RandomGenerator;Lnet/minecraft/util/math/BlockPos;)V}
+       */
+      void emit(World world, RandomGenerator random, BlockPos pos);
    }
 }
diff -bur namedTargetSrc/net/minecraft/block/enums/VaultState.java namedSrc/net/minecraft/block/enums/VaultState.java
--- namedTargetSrc/net/minecraft/block/enums/VaultState.java	2024-02-06 22:39:23.432678824 +0000
+++ namedSrc/net/minecraft/block/enums/VaultState.java	2024-02-06 22:38:09.992651840 +0000
@@ -181,8 +181,8 @@
     * @mapping {@literal hashed m_ekopnsum Lnet/minecraft/unmapped/C_oocnpsfc;m_ekopnsum(Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_cudfnjix;Lnet/minecraft/unmapped/C_nsbycoiv;Lnet/minecraft/unmapped/C_czyoqmgb;D)Lnet/minecraft/unmapped/C_oocnpsfc;}
     * @mapping {@literal named m_ekopnsum Lnet/minecraft/block/enums/VaultState;m_ekopnsum(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/unmapped/C_cudfnjix;Lnet/minecraft/unmapped/C_nsbycoiv;Lnet/minecraft/unmapped/C_czyoqmgb;D)Lnet/minecraft/block/enums/VaultState;}
     */
-   private static VaultState m_ekopnsum(ServerWorld world, BlockPos pos, C_cudfnjix arg3, C_nsbycoiv arg4, C_czyoqmgb arg5, double d) {
-      arg5.m_uflgzskl(world, pos, arg4, arg3, d);
+   private static VaultState m_ekopnsum(ServerWorld world, BlockPos pos, C_cudfnjix arg3, C_nsbycoiv arg4, C_czyoqmgb arg5, double range) {
+      arg5.m_uflgzskl(world, pos, arg4, arg3, range);
       arg4.m_tluakpxm(world.getTime() + 20L);
       return arg5.m_jamphmeb() ? ACTIVE : INACTIVE;
    }
diff -bur namedTargetSrc/net/minecraft/block/SpawnerBlock.java namedSrc/net/minecraft/block/SpawnerBlock.java
--- namedTargetSrc/net/minecraft/block/SpawnerBlock.java	2024-02-06 22:39:23.572678869 +0000
+++ namedSrc/net/minecraft/block/SpawnerBlock.java	2024-02-06 22:38:10.152651897 +0000
@@ -11,7 +11,6 @@
 import net.minecraft.registry.DynamicRegistryManager;
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.text.Text;
-import net.minecraft.unmapped.C_xheeywhc;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.BlockView;
 import net.minecraft.world.World;
@@ -89,6 +88,6 @@
       ItemStack stack, @Nullable BlockView world, List<Text> tooltip, TooltipContext options, @Nullable DynamicRegistryManager registryManager
    ) {
       super.appendTooltip(stack, world, tooltip, options, registryManager);
-      C_xheeywhc.m_vysbdnfp(stack, tooltip, "SpawnData");
+      Spawner.appendTooltip(stack, tooltip, "SpawnData");
    }
 }
Only in namedSrc/net/minecraft/block: Spawner.java
Only in namedSrc/net/minecraft/block: TrialSpawnerConfig.java
Only in namedSrc/net/minecraft/block: TrialSpawnerData.java
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/Screen.java namedSrc/net/minecraft/client/gui/screen/Screen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/Screen.java	2024-02-06 22:39:23.372678804 +0000
+++ namedSrc/net/minecraft/client/gui/screen/Screen.java	2024-02-06 22:38:09.908651811 +0000
@@ -754,7 +754,7 @@
     * Mapping not found
     */
    @Override
-   public boolean isMouseOver(double d, double e) {
+   public boolean isMouseOver(double mouseX, double mouseY) {
       return true;
    }
 
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/ClickableWidget.java namedSrc/net/minecraft/client/gui/widget/ClickableWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/ClickableWidget.java	2024-02-06 22:39:23.584678873 +0000
+++ namedSrc/net/minecraft/client/gui/widget/ClickableWidget.java	2024-02-06 22:38:10.164651901 +0000
@@ -335,13 +335,13 @@
     * Mapping not found
     */
    @Override
-   public boolean isMouseOver(double d, double e) {
+   public boolean isMouseOver(double mouseX, double mouseY) {
       return this.active
          && this.visible
-         && d >= (double)this.getX()
-         && e >= (double)this.getY()
-         && d < (double)(this.getX() + this.width)
-         && e < (double)(this.getY() + this.height);
+         && mouseX >= (double)this.getX()
+         && mouseY >= (double)this.getY()
+         && mouseX < (double)(this.getX() + this.width)
+         && mouseY < (double)(this.getY() + this.height);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/list/EntryListWidget.java namedSrc/net/minecraft/client/gui/widget/list/EntryListWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/list/EntryListWidget.java	2024-02-06 22:39:23.352678799 +0000
+++ namedSrc/net/minecraft/client/gui/widget/list/EntryListWidget.java	2024-02-06 22:38:09.888651804 +0000
@@ -597,8 +597,8 @@
     * Mapping not found
     */
    @Override
-   public boolean isMouseOver(double d, double e) {
-      return e >= (double)this.getY() && e <= (double)this.getYEnd() && d >= (double)this.getX() && d <= (double)this.getXEnd();
+   public boolean isMouseOver(double mouseX, double mouseY) {
+      return mouseY >= (double)this.getY() && mouseY <= (double)this.getYEnd() && mouseX >= (double)this.getX() && mouseX <= (double)this.getXEnd();
    }
 
    /**
@@ -863,8 +863,8 @@
        * @mapping {@literal named isMouseOver Lnet/minecraft/client/gui/widget/list/EntryListWidget$Entry;isMouseOver(DD)Z}
        */
       @Override
-      public boolean isMouseOver(double d, double e) {
-         return Objects.equals(this.parentList.getEntryAtPosition(d, e), this);
+      public boolean isMouseOver(double mouseX, double mouseY) {
+         return Objects.equals(this.parentList.getEntryAtPosition(mouseX, mouseY), this);
       }
    }
 }
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/recipe_book/RecipeAlternativesWidget.java namedSrc/net/minecraft/client/gui/widget/recipe_book/RecipeAlternativesWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/recipe_book/RecipeAlternativesWidget.java	2024-02-06 22:39:23.452678831 +0000
+++ namedSrc/net/minecraft/client/gui/widget/recipe_book/RecipeAlternativesWidget.java	2024-02-06 22:38:10.012651847 +0000
@@ -243,7 +243,7 @@
     * Mapping not found
     */
    @Override
-   public boolean isMouseOver(double d, double e) {
+   public boolean isMouseOver(double mouseX, double mouseY) {
       return false;
    }
 
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/recipe_book/RecipeBookWidget.java namedSrc/net/minecraft/client/gui/widget/recipe_book/RecipeBookWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/recipe_book/RecipeBookWidget.java	2024-02-06 22:39:23.592678876 +0000
+++ namedSrc/net/minecraft/client/gui/widget/recipe_book/RecipeBookWidget.java	2024-02-06 22:38:10.168651902 +0000
@@ -637,7 +637,7 @@
     * Mapping not found
     */
    @Override
-   public boolean isMouseOver(double d, double e) {
+   public boolean isMouseOver(double mouseX, double mouseY) {
       return false;
    }
 
diff -bur namedTargetSrc/net/minecraft/client/render/block/entity/MobSpawnerBlockEntityRenderer.java namedSrc/net/minecraft/client/render/block/entity/MobSpawnerBlockEntityRenderer.java
--- namedTargetSrc/net/minecraft/client/render/block/entity/MobSpawnerBlockEntityRenderer.java	2024-02-06 22:39:23.420678820 +0000
+++ namedSrc/net/minecraft/client/render/block/entity/MobSpawnerBlockEntityRenderer.java	2024-02-06 22:38:09.980651836 +0000
@@ -42,24 +42,24 @@
          MobSpawnerLogic lv2 = arg.getLogic();
          Entity lv3 = lv2.getRenderedEntity(lv, arg.getPos());
          if (lv3 != null) {
-            m_faiduebl(f, matrices, vertexConsumers, i, lv3, this.entityRendererDispatcher, lv2.getPrevSpin(), lv2.getSpin());
+            renderSpinningEntity(f, matrices, vertexConsumers, i, lv3, this.entityRendererDispatcher, lv2.getPrevSpin(), lv2.getSpin());
          }
       }
    }
 
    /**
     * @mapping {@literal hashed m_faiduebl Lnet/minecraft/unmapped/C_iglgryfd;m_faiduebl(FLnet/minecraft/unmapped/C_cnszsxvd;Lnet/minecraft/unmapped/C_igrgeffe;ILnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_gmkqxljo;DD)V}
-    * @mapping {@literal named m_faiduebl Lnet/minecraft/client/render/block/entity/MobSpawnerBlockEntityRenderer;m_faiduebl(FLnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;ILnet/minecraft/entity/Entity;Lnet/minecraft/client/render/entity/EntityRenderDispatcher;DD)V}
+    * @mapping {@literal named renderSpinningEntity Lnet/minecraft/client/render/block/entity/MobSpawnerBlockEntityRenderer;renderSpinningEntity(FLnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;ILnet/minecraft/entity/Entity;Lnet/minecraft/client/render/entity/EntityRenderDispatcher;DD)V}
     */
-   public static void m_faiduebl(
+   public static void renderSpinningEntity(
       float delta,
       MatrixStack matrices,
       VertexConsumerProvider vertexConsumers,
       int light,
       Entity entity,
       EntityRenderDispatcher renderDispatcher,
-      double start,
-      double end
+      double prevRotation,
+      double rotation
    ) {
       matrices.push();
       matrices.translate(0.5F, 0.0F, 0.5F);
@@ -70,7 +70,7 @@
       }
 
       matrices.translate(0.0F, 0.4F, 0.0F);
-      matrices.rotate(Axis.Y_POSITIVE.rotationDegrees((float)MathHelper.lerp((double)delta, start, end) * 10.0F));
+      matrices.rotate(Axis.Y_POSITIVE.rotationDegrees((float)MathHelper.lerp((double)delta, prevRotation, rotation) * 10.0F));
       matrices.translate(0.0F, -0.2F, 0.0F);
       matrices.rotate(Axis.X_POSITIVE.rotationDegrees(-30.0F));
       matrices.scale(g, g, g);
diff -bur namedTargetSrc/net/minecraft/client/render/block/entity/TrialSpawnerBlockEntityRenderer.java namedSrc/net/minecraft/client/render/block/entity/TrialSpawnerBlockEntityRenderer.java
--- namedTargetSrc/net/minecraft/client/render/block/entity/TrialSpawnerBlockEntityRenderer.java	2024-02-06 22:39:23.472678837 +0000
+++ namedSrc/net/minecraft/client/render/block/entity/TrialSpawnerBlockEntityRenderer.java	2024-02-06 22:38:10.040651857 +0000
@@ -2,13 +2,13 @@
 
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
+import net.minecraft.block.TrialSpawnerData;
 import net.minecraft.block.entity.TrialSpawnerBlockEntity;
 import net.minecraft.client.render.VertexConsumerProvider;
 import net.minecraft.client.render.entity.EntityRenderDispatcher;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.entity.Entity;
-import net.minecraft.unmapped.C_jelkcvqk;
-import net.minecraft.unmapped.C_kxkfzuix;
+import net.minecraft.world.TrialSpawnerLogic;
 import net.minecraft.world.World;
 
 /**
@@ -38,11 +38,13 @@
    public void render(TrialSpawnerBlockEntity arg, float f, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int i, int j) {
       World lv = arg.getWorld();
       if (lv != null) {
-         C_jelkcvqk lv2 = arg.m_wvhkrgdu();
-         C_kxkfzuix lv3 = lv2.m_uohhenov();
-         Entity lv4 = lv3.m_mnonaikc(lv2, lv, lv2.m_gtgamtxz());
+         TrialSpawnerLogic lv2 = arg.getSpawnerLogic();
+         TrialSpawnerData lv3 = lv2.getData();
+         Entity lv4 = lv3.getOrCreateDisplayEntity(lv2, lv, lv2.getState());
          if (lv4 != null) {
-            MobSpawnerBlockEntityRenderer.m_faiduebl(f, matrices, vertexConsumers, i, lv4, this.dispatcher, lv3.m_rvfytrpa(), lv3.m_yjdsgxat());
+            MobSpawnerBlockEntityRenderer.renderSpinningEntity(
+               f, matrices, vertexConsumers, i, lv4, this.dispatcher, lv3.getLastDisplayEntityRotation(), lv3.getDisplayEntityRotation()
+            );
          }
       }
    }
diff -bur namedTargetSrc/net/minecraft/client/render/WorldRenderer.java namedSrc/net/minecraft/client/render/WorldRenderer.java
--- namedTargetSrc/net/minecraft/client/render/WorldRenderer.java	2024-02-06 22:39:23.368678803 +0000
+++ namedSrc/net/minecraft/client/render/WorldRenderer.java	2024-02-06 22:38:09.904651809 +0000
@@ -94,7 +94,6 @@
 import net.minecraft.sound.SoundEvents;
 import net.minecraft.state.property.Properties;
 import net.minecraft.text.Text;
-import net.minecraft.unmapped.C_jelkcvqk;
 import net.minecraft.unmapped.C_jnliocmw;
 import net.minecraft.unmapped.C_sjynkhfr;
 import net.minecraft.util.Identifier;
@@ -123,6 +122,7 @@
 import net.minecraft.world.BlockView;
 import net.minecraft.world.Heightmap;
 import net.minecraft.world.LightType;
+import net.minecraft.world.TrialSpawnerLogic;
 import net.minecraft.world.World;
 import net.minecraft.world.WorldEvents;
 import net.minecraft.world.WorldView;
@@ -3628,22 +3628,22 @@
             ParticleUtil.spawnParticle(this.world, pos, ParticleTypes.EGG_CRACK, UniformIntProvider.create(3, 6));
             break;
          case 3011:
-            C_jelkcvqk.m_bfccdstr(this.world, pos, lv);
+            TrialSpawnerLogic.addSpawnParticles(this.world, pos, lv);
             break;
          case 3012:
             this.world
                .playSound(pos, SoundEvents.BLOCK_TRIAL_SPAWNER_SPAWN_MOB, SoundCategory.BLOCKS, 1.0F, (lv.nextFloat() - lv.nextFloat()) * 0.2F + 1.0F, true);
-            C_jelkcvqk.m_bfccdstr(this.world, pos, lv);
+            TrialSpawnerLogic.addSpawnParticles(this.world, pos, lv);
             break;
          case 3013:
             this.world
                .playSound(pos, SoundEvents.BLOCK_TRIAL_SPAWNER_DETECT_PLAYER, SoundCategory.BLOCKS, 1.0F, (lv.nextFloat() - lv.nextFloat()) * 0.2F + 1.0F, true);
-            C_jelkcvqk.m_wubotvnx(this.world, pos, lv, data);
+            TrialSpawnerLogic.addDetectionParticles(this.world, pos, lv, data);
             break;
          case 3014:
             this.world
                .playSound(pos, SoundEvents.BLOCK_TRIAL_SPAWNER_EJECT_ITEM, SoundCategory.BLOCKS, 1.0F, (lv.nextFloat() - lv.nextFloat()) * 0.2F + 1.0F, true);
-            C_jelkcvqk.m_dalhosuv(this.world, pos, lv);
+            TrialSpawnerLogic.addEjectItemParticles(this.world, pos, lv);
             break;
          case 3015:
             if (this.world.getBlockEntity(pos) instanceof VaultBlockEntity lv9) {
@@ -3656,7 +3656,7 @@
             this.world.playSound(pos, SoundEvents.BLOCK_VAULT_DEACTIVATE, SoundCategory.BLOCKS, 1.0F, (lv.nextFloat() - lv.nextFloat()) * 0.2F + 1.0F, true);
             break;
          case 3017:
-            C_jelkcvqk.m_dalhosuv(this.world, pos, lv);
+            TrialSpawnerLogic.addEjectItemParticles(this.world, pos, lv);
       }
    }
 
diff -bur namedTargetSrc/net/minecraft/item/SpawnEggItem.java namedSrc/net/minecraft/item/SpawnEggItem.java
--- namedTargetSrc/net/minecraft/item/SpawnEggItem.java	2024-02-06 22:39:23.452678831 +0000
+++ namedSrc/net/minecraft/item/SpawnEggItem.java	2024-02-06 22:38:10.016651849 +0000
@@ -8,6 +8,7 @@
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.FluidBlock;
+import net.minecraft.block.Spawner;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.SpawnReason;
@@ -19,7 +20,6 @@
 import net.minecraft.nbt.NbtElement;
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.stat.Stats;
-import net.minecraft.unmapped.C_xheeywhc;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.Hand;
 import net.minecraft.util.TypedActionResult;
@@ -84,9 +84,9 @@
          BlockPos lv3 = context.getBlockPos();
          Direction lv4 = context.getSide();
          BlockState lv5 = lv.getBlockState(lv3);
-         if (lv.getBlockEntity(lv3) instanceof C_xheeywhc lv6) {
+         if (lv.getBlockEntity(lv3) instanceof Spawner lv6) {
             EntityType<?> lv7 = this.getEntityType(lv2.getNbt());
-            lv6.m_aohplshh(lv7, lv.getRandom());
+            lv6.setEntityType(lv7, lv.getRandom());
             lv.updateListeners(lv3, lv5, lv5, Block.NOTIFY_ALL);
             lv.emitGameEvent(context.getPlayer(), GameEvent.BLOCK_CHANGE, lv3);
             lv2.decrement(1);
diff -bur namedTargetSrc/net/minecraft/structure/MineshaftGenerator.java namedSrc/net/minecraft/structure/MineshaftGenerator.java
--- namedTargetSrc/net/minecraft/structure/MineshaftGenerator.java	2024-02-06 22:39:23.548678861 +0000
+++ namedSrc/net/minecraft/structure/MineshaftGenerator.java	2024-02-06 22:38:10.120651885 +0000
@@ -498,7 +498,7 @@
                      this.hasSpawner = true;
                      world.setBlockState(lv2, Blocks.SPAWNER.getDefaultState(), Block.NOTIFY_LISTENERS);
                      if (world.getBlockEntity(lv2) instanceof MobSpawnerBlockEntity lv4) {
-                        lv4.m_aohplshh(EntityType.CAVE_SPIDER, random);
+                        lv4.setEntityType(EntityType.CAVE_SPIDER, random);
                      }
                   }
                }
diff -bur namedTargetSrc/net/minecraft/structure/NetherFortressGenerator.java namedSrc/net/minecraft/structure/NetherFortressGenerator.java
--- namedTargetSrc/net/minecraft/structure/NetherFortressGenerator.java	2024-02-06 22:39:23.628678887 +0000
+++ namedSrc/net/minecraft/structure/NetherFortressGenerator.java	2024-02-06 22:38:10.208651916 +0000
@@ -607,7 +607,7 @@
                this.hasBlazeSpawner = true;
                world.setBlockState(lv3, Blocks.SPAWNER.getDefaultState(), Block.NOTIFY_LISTENERS);
                if (world.getBlockEntity(lv3) instanceof MobSpawnerBlockEntity lv5) {
-                  lv5.m_aohplshh(EntityType.BLAZE, random);
+                  lv5.setEntityType(EntityType.BLAZE, random);
                }
             }
          }
diff -bur namedTargetSrc/net/minecraft/structure/StrongholdGenerator.java namedSrc/net/minecraft/structure/StrongholdGenerator.java
--- namedTargetSrc/net/minecraft/structure/StrongholdGenerator.java	2024-02-06 22:39:23.472678837 +0000
+++ namedSrc/net/minecraft/structure/StrongholdGenerator.java	2024-02-06 22:38:10.040651857 +0000
@@ -1567,7 +1567,7 @@
                this.spawnerPlaced = true;
                world.setBlockState(lv9, Blocks.SPAWNER.getDefaultState(), Block.NOTIFY_LISTENERS);
                if (world.getBlockEntity(lv9) instanceof MobSpawnerBlockEntity lv11) {
-                  lv11.m_aohplshh(EntityType.SILVERFISH, random);
+                  lv11.setEntityType(EntityType.SILVERFISH, random);
                }
             }
          }
diff -bur namedTargetSrc/net/minecraft/unmapped/C_cudfnjix.java namedSrc/net/minecraft/unmapped/C_cudfnjix.java
--- namedTargetSrc/net/minecraft/unmapped/C_cudfnjix.java	2024-02-06 22:39:23.596678877 +0000
+++ namedSrc/net/minecraft/unmapped/C_cudfnjix.java	2024-02-06 22:38:10.176651905 +0000
@@ -9,6 +9,7 @@
 import net.minecraft.loot.LootTables;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.dynamic.Codecs;
+import net.minecraft.world.EntityDetector;
 
 /**
  * @mapping {@literal hashed net/minecraft/unmapped/C_cudfnjix}
@@ -20,8 +21,8 @@
    double deactivationRange,
    ItemStack keyItem,
    Optional<Identifier> overrideLootTableToDisplay,
-   C_kkiexczn playerDetector,
-   C_kkiexczn.C_ztluwxut entitySelector
+   EntityDetector playerDetector,
+   EntityDetector.EntitySelector entitySelector
 ) {
    /**
     * Mapping not found
@@ -59,8 +60,8 @@
          4.5,
          new ItemStack(Items.TRIAL_KEY),
          Optional.empty(),
-         C_kkiexczn.f_yumifdey,
-         C_kkiexczn.C_ztluwxut.f_upomikid
+         EntityDetector.NON_SPECTATING_PLAYERS,
+         EntityDetector.EntitySelector.WORLD_ENTITY_SELECTOR
       );
    }
 
@@ -75,7 +76,7 @@
    /**
     * Mapping not found
     */
-   public C_kkiexczn m_gwbttbvm() {
+   public EntityDetector m_gwbttbvm() {
       return this.playerDetector;
    }
 
diff -bur namedTargetSrc/net/minecraft/unmapped/C_czyoqmgb.java namedSrc/net/minecraft/unmapped/C_czyoqmgb.java
--- namedTargetSrc/net/minecraft/unmapped/C_czyoqmgb.java	2024-02-06 22:39:23.448678829 +0000
+++ namedSrc/net/minecraft/unmapped/C_czyoqmgb.java	2024-02-06 22:38:10.012651847 +0000
@@ -120,9 +120,9 @@
     * @mapping {@literal hashed m_uflgzskl Lnet/minecraft/unmapped/C_czyoqmgb;m_uflgzskl(Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_nsbycoiv;Lnet/minecraft/unmapped/C_cudfnjix;D)V}
     * @mapping {@literal named m_uflgzskl Lnet/minecraft/unmapped/C_czyoqmgb;m_uflgzskl(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/unmapped/C_nsbycoiv;Lnet/minecraft/unmapped/C_cudfnjix;D)V}
     */
-   void m_uflgzskl(ServerWorld world, BlockPos pos, C_nsbycoiv arg3, C_cudfnjix arg4, double d) {
+   void m_uflgzskl(ServerWorld world, BlockPos pos, C_nsbycoiv arg3, C_cudfnjix arg4, double range) {
       Set<UUID> set = (Set<UUID>)arg4.m_gwbttbvm()
-         .detect(world, arg4.entitySelector(), pos, d)
+         .detect(world, arg4.entitySelector(), pos, range)
          .stream()
          .filter(uuid -> !arg3.m_jkvzabvv().contains(uuid))
          .collect(Collectors.toSet());
Only in namedTargetSrc/net/minecraft/unmapped: C_jelkcvqk.java
Only in namedTargetSrc/net/minecraft/unmapped: C_kkiexczn.java
Only in namedTargetSrc/net/minecraft/unmapped: C_kxkfzuix.java
Only in namedTargetSrc/net/minecraft/unmapped: C_pocjjnjk.java
diff -bur namedTargetSrc/net/minecraft/unmapped/C_qiypfnai.java namedSrc/net/minecraft/unmapped/C_qiypfnai.java
--- namedTargetSrc/net/minecraft/unmapped/C_qiypfnai.java	2024-02-06 22:39:23.392678811 +0000
+++ namedSrc/net/minecraft/unmapped/C_qiypfnai.java	2024-02-06 22:38:09.932651819 +0000
@@ -7,6 +7,7 @@
 import net.minecraft.block.BlockRenderType;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.BlockWithEntity;
+import net.minecraft.block.Spawner;
 import net.minecraft.block.entity.BlockEntity;
 import net.minecraft.block.entity.BlockEntityTicker;
 import net.minecraft.block.entity.BlockEntityType;
@@ -89,8 +90,8 @@
    @Override
    public <T extends BlockEntity> BlockEntityTicker<T> getTicker(World world, BlockState state, BlockEntityType<T> type) {
       return world instanceof ServerWorld lv
-         ? checkType(type, BlockEntityType.TRIAL_SPAWNER, (arg2, pos, statex, arg5) -> arg5.m_wvhkrgdu().m_mugawpjd(lv, pos))
-         : checkType(type, BlockEntityType.TRIAL_SPAWNER, (worldx, pos, statex, arg4) -> arg4.m_wvhkrgdu().m_bftllosi(worldx, pos));
+         ? checkType(type, BlockEntityType.TRIAL_SPAWNER, (arg2, pos, statex, arg5) -> arg5.getSpawnerLogic().tickServer(lv, pos))
+         : checkType(type, BlockEntityType.TRIAL_SPAWNER, (worldx, pos, statex, arg4) -> arg4.getSpawnerLogic().tickClient(worldx, pos));
    }
 
    /**
@@ -101,6 +102,6 @@
       ItemStack stack, @Nullable BlockView world, List<Text> tooltip, TooltipContext options, @Nullable DynamicRegistryManager registryManager
    ) {
       super.appendTooltip(stack, world, tooltip, options, registryManager);
-      C_xheeywhc.m_vysbdnfp(stack, tooltip, "spawn_data");
+      Spawner.appendTooltip(stack, tooltip, "spawn_data");
    }
 }
Only in namedTargetSrc/net/minecraft/unmapped: C_xheeywhc.java
Only in namedSrc/net/minecraft/world: EntityDetector.java
diff -bur namedTargetSrc/net/minecraft/world/gen/feature/DungeonFeature.java namedSrc/net/minecraft/world/gen/feature/DungeonFeature.java
--- namedTargetSrc/net/minecraft/world/gen/feature/DungeonFeature.java	2024-02-06 22:39:23.628678887 +0000
+++ namedSrc/net/minecraft/world/gen/feature/DungeonFeature.java	2024-02-06 22:38:10.204651915 +0000
@@ -138,7 +138,7 @@
 
          this.setBlockStateIf(lv3, lv, Blocks.SPAWNER.getDefaultState(), predicate);
          if (lv3.getBlockEntity(lv) instanceof MobSpawnerBlockEntity lv10) {
-            lv10.m_aohplshh(this.getMobSpawnerEntity(lv2), lv2);
+            lv10.setEntityType(this.getMobSpawnerEntity(lv2), lv2);
          } else {
             LOGGER.error("Failed to fetch mob spawner entity at ({}, {}, {})", lv.getX(), lv.getY(), lv.getZ());
          }
diff -bur namedTargetSrc/net/minecraft/world/MobSpawnerEntry.java namedSrc/net/minecraft/world/MobSpawnerEntry.java
--- namedTargetSrc/net/minecraft/world/MobSpawnerEntry.java	2024-02-06 22:39:23.608678881 +0000
+++ namedSrc/net/minecraft/world/MobSpawnerEntry.java	2024-02-06 22:38:10.188651909 +0000
@@ -122,9 +122,9 @@
 
       /**
        * @mapping {@literal hashed m_oafnehiw Lnet/minecraft/unmapped/C_edcjbljn$C_jzmzunnv;m_oafnehiw(Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_bdwnwhiu;)Z}
-       * @mapping {@literal named m_oafnehiw Lnet/minecraft/world/MobSpawnerEntry$CustomSpawnRules;m_oafnehiw(Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/server/world/ServerWorld;)Z}
+       * @mapping {@literal named canSpawn Lnet/minecraft/world/MobSpawnerEntry$CustomSpawnRules;canSpawn(Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/server/world/ServerWorld;)Z}
        */
-      public boolean m_oafnehiw(BlockPos pos, ServerWorld world) {
+      public boolean canSpawn(BlockPos pos, ServerWorld world) {
          return this.blockLightLimit.isWithinRange(world.getLightLevel(LightType.BLOCK, pos))
             && this.skyLightLimit.isWithinRange(world.getLightLevel(LightType.SKY, pos));
       }
diff -bur namedTargetSrc/net/minecraft/world/MobSpawnerLogic.java namedSrc/net/minecraft/world/MobSpawnerLogic.java
--- namedTargetSrc/net/minecraft/world/MobSpawnerLogic.java	2024-02-06 22:39:23.524678853 +0000
+++ namedSrc/net/minecraft/world/MobSpawnerLogic.java	2024-02-06 22:38:10.092651875 +0000
@@ -186,7 +186,7 @@
                      }
 
                      MobSpawnerEntry.CustomSpawnRules lv6 = (MobSpawnerEntry.CustomSpawnRules)lv2.getCustomSpawnRules().get();
-                     if (!lv6.m_oafnehiw(lv5, world)) {
+                     if (!lv6.canSpawn(lv5, world)) {
                         continue;
                      }
                   } else if (!SpawnRestriction.canSpawn((EntityType)optional.get(), world, SpawnReason.SPAWNER, lv5, world.getRandom())) {
Only in namedSrc/net/minecraft/world: TrialSpawnerLogic.java

Please sign in to comment.