Skip to content

Commit

Permalink
some more
Browse files Browse the repository at this point in the history
  • Loading branch information
@ix0rai
ix0rai committed Apr 2, 2024
1 parent 1a2c9f2 commit f312358
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 0 deletions.
6 changes: 6 additions & 0 deletions mappings/net/minecraft/block/enums/TrialSpawnerState.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
10 changes: 10 additions & 0 deletions mappings/net/minecraft/world/TrialSpawnerLogic.mapping
View file
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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
Expand Down
1 change: 1 addition & 0 deletions mappings/net/minecraft/world/event/GameEvent.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions mappings/net/minecraft/world/event/PositionSourceType.mapping
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 2 additions & 0 deletions mappings/net/minecraft/world/event/listener/GameEventListener.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
5 changes: 5 additions & 0 deletions mappings/net/minecraft/world/updater/WorldUpdater.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down

3 comments on commit f312358

@github-actions
Copy link

Choose a reason for hiding this comment

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

With commit f312358, 51 file(s) were updated with 575 line(s) added and 529 removed compared to the latest Quilt Mappings version.

View the diff here (1/3): 
diff -bur namedTargetSrc/net/minecraft/block/BlockEntityProvider.java namedSrc/net/minecraft/block/BlockEntityProvider.java
--- namedTargetSrc/net/minecraft/block/BlockEntityProvider.java	2024-04-02 02:33:24.184586855 +0000
+++ namedSrc/net/minecraft/block/BlockEntityProvider.java	2024-04-02 02:32:14.652105424 +0000
@@ -36,6 +36,6 @@
     */
    @Nullable
    default <T extends BlockEntity> GameEventListener getGameEventListener(ServerWorld world, T blockEntity) {
-      return blockEntity instanceof GameEventListener.C_ohqzxsuw<?> lv ? lv.m_duureayn() : null;
+      return blockEntity instanceof GameEventListener.Provider<?> lv ? lv.getListener() : null;
    }
 }
diff -bur namedTargetSrc/net/minecraft/block/entity/SculkCatalystBlockEntity.java namedSrc/net/minecraft/block/entity/SculkCatalystBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/SculkCatalystBlockEntity.java	2024-04-02 02:33:24.268587390 +0000
+++ namedSrc/net/minecraft/block/entity/SculkCatalystBlockEntity.java	2024-04-02 02:32:14.712105875 +0000
@@ -30,7 +30,7 @@
  * @mapping {@literal hashed net/minecraft/unmapped/C_mztoqymb}
  * @mapping {@literal named net/minecraft/block/entity/SculkCatalystBlockEntity}
  */
-public class SculkCatalystBlockEntity extends BlockEntity implements GameEventListener.C_ohqzxsuw<SculkCatalystBlockEntity.CatalystListener> {
+public class SculkCatalystBlockEntity extends BlockEntity implements GameEventListener.Provider<SculkCatalystBlockEntity.CatalystListener> {
    /**
     * @mapping {@literal hashed f_wxktruda Lnet/minecraft/unmapped/C_mztoqymb;f_wxktruda:Lnet/minecraft/unmapped/C_mztoqymb$C_gcdvmpek;}
     * @mapping {@literal named catalystListener Lnet/minecraft/block/entity/SculkCatalystBlockEntity;catalystListener:Lnet/minecraft/block/entity/SculkCatalystBlockEntity$CatalystListener;}
@@ -73,10 +73,10 @@
    }
 
    /**
-    * @mapping {@literal hashed m_duureayn Lnet/minecraft/unmapped/C_mztoqymb;m_duureayn()Lnet/minecraft/unmapped/C_mztoqymb$C_gcdvmpek;}
-    * @mapping {@literal named m_duureayn Lnet/minecraft/block/entity/SculkCatalystBlockEntity;m_duureayn()Lnet/minecraft/block/entity/SculkCatalystBlockEntity$CatalystListener;}
+    * @mapping {@literal hashed m_zuuuxfsm Lnet/minecraft/unmapped/C_mztoqymb;m_zuuuxfsm()Lnet/minecraft/unmapped/C_mztoqymb$C_gcdvmpek;}
+    * @mapping {@literal named getListener Lnet/minecraft/block/entity/SculkCatalystBlockEntity;getListener()Lnet/minecraft/block/entity/SculkCatalystBlockEntity$CatalystListener;}
     */
-   public SculkCatalystBlockEntity.CatalystListener m_duureayn() {
+   public SculkCatalystBlockEntity.CatalystListener getListener() {
       return this.catalystListener;
    }
 
diff -bur namedTargetSrc/net/minecraft/block/entity/SculkSensorBlockEntity.java namedSrc/net/minecraft/block/entity/SculkSensorBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/SculkSensorBlockEntity.java	2024-04-02 02:33:24.300587594 +0000
+++ namedSrc/net/minecraft/block/entity/SculkSensorBlockEntity.java	2024-04-02 02:32:14.748106143 +0000
@@ -24,7 +24,7 @@
  * @mapping {@literal hashed net/minecraft/unmapped/C_pqjuvriw}
  * @mapping {@literal named net/minecraft/block/entity/SculkSensorBlockEntity}
  */
-public class SculkSensorBlockEntity extends BlockEntity implements GameEventListener.C_ohqzxsuw<VibrationManager.Listener>, VibrationManager {
+public class SculkSensorBlockEntity extends BlockEntity implements GameEventListener.Provider<VibrationManager.Listener>, VibrationManager {
    /**
     * @mapping {@literal hashed f_innqgvgr Lnet/minecraft/unmapped/C_pqjuvriw;f_innqgvgr:Lorg/slf4j/Logger;}
     * @mapping {@literal named LOGGER Lnet/minecraft/block/entity/SculkSensorBlockEntity;LOGGER:Lorg/slf4j/Logger;}
@@ -135,10 +135,10 @@
    }
 
    /**
-    * @mapping {@literal hashed m_duureayn Lnet/minecraft/unmapped/C_pqjuvriw;m_duureayn()Lnet/minecraft/unmapped/C_ddxrijfx$C_bbtmyknw;}
-    * @mapping {@literal named m_duureayn Lnet/minecraft/block/entity/SculkSensorBlockEntity;m_duureayn()Lnet/minecraft/world/event/vibration/VibrationManager$Listener;}
+    * @mapping {@literal hashed m_glymjlsc Lnet/minecraft/unmapped/C_pqjuvriw;m_glymjlsc()Lnet/minecraft/unmapped/C_ddxrijfx$C_bbtmyknw;}
+    * @mapping {@literal named getListener Lnet/minecraft/block/entity/SculkSensorBlockEntity;getListener()Lnet/minecraft/world/event/vibration/VibrationManager$Listener;}
     */
-   public VibrationManager.Listener m_duureayn() {
+   public VibrationManager.Listener getListener() {
       return this.listener;
    }
 
diff -bur namedTargetSrc/net/minecraft/block/entity/SculkShriekerBlockEntity.java namedSrc/net/minecraft/block/entity/SculkShriekerBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/SculkShriekerBlockEntity.java	2024-04-02 02:33:24.296587568 +0000
+++ namedSrc/net/minecraft/block/entity/SculkShriekerBlockEntity.java	2024-04-02 02:32:14.740106084 +0000
@@ -49,7 +49,7 @@
  * @mapping {@literal hashed net/minecraft/unmapped/C_pnalulqo}
  * @mapping {@literal named net/minecraft/block/entity/SculkShriekerBlockEntity}
  */
-public class SculkShriekerBlockEntity extends BlockEntity implements GameEventListener.C_ohqzxsuw<VibrationManager.Listener>, VibrationManager {
+public class SculkShriekerBlockEntity extends BlockEntity implements GameEventListener.Provider<VibrationManager.Listener>, VibrationManager {
    /**
     * @mapping {@literal hashed f_kblolahs Lnet/minecraft/unmapped/C_pnalulqo;f_kblolahs:Lorg/slf4j/Logger;}
     * @mapping {@literal named LOGGER Lnet/minecraft/block/entity/SculkShriekerBlockEntity;LOGGER:Lorg/slf4j/Logger;}
@@ -291,10 +291,10 @@
    }
 
    /**
-    * @mapping {@literal hashed m_duureayn Lnet/minecraft/unmapped/C_pnalulqo;m_duureayn()Lnet/minecraft/unmapped/C_ddxrijfx$C_bbtmyknw;}
-    * @mapping {@literal named m_duureayn Lnet/minecraft/block/entity/SculkShriekerBlockEntity;m_duureayn()Lnet/minecraft/world/event/vibration/VibrationManager$Listener;}
+    * @mapping {@literal hashed m_lbmdczem Lnet/minecraft/unmapped/C_pnalulqo;m_lbmdczem()Lnet/minecraft/unmapped/C_ddxrijfx$C_bbtmyknw;}
+    * @mapping {@literal named getListener Lnet/minecraft/block/entity/SculkShriekerBlockEntity;getListener()Lnet/minecraft/world/event/vibration/VibrationManager$Listener;}
     */
-   public VibrationManager.Listener m_duureayn() {
+   public VibrationManager.Listener getListener() {
       return this.vibrationListener;
    }
 
diff -bur namedTargetSrc/net/minecraft/block/enums/TrialSpawnerState.java namedSrc/net/minecraft/block/enums/TrialSpawnerState.java
--- namedTargetSrc/net/minecraft/block/enums/TrialSpawnerState.java	2024-04-02 02:33:24.312587670 +0000
+++ namedSrc/net/minecraft/block/enums/TrialSpawnerState.java	2024-04-02 02:32:14.760106234 +0000
@@ -10,6 +10,7 @@
 import net.minecraft.block.TrialSpawnerConfig;
 import net.minecraft.block.TrialSpawnerData;
 import net.minecraft.entity.Entity;
+import net.minecraft.entity.OminousItemSpawnerEntity;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.particle.DefaultParticleType;
@@ -17,7 +18,6 @@
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.sound.SoundCategory;
 import net.minecraft.sound.SoundEvents;
-import net.minecraft.unmapped.C_czxrapyw;
 import net.minecraft.util.StringIdentifiable;
 import net.minecraft.util.Util;
 import net.minecraft.util.hit.BlockHitResult;
@@ -119,48 +119,48 @@
     * @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 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 tick(BlockPos pos, TrialSpawnerLogic arg2, ServerWorld world) {
-      TrialSpawnerData lv = arg2.getData();
-      TrialSpawnerConfig lv2 = arg2.getConfig();
+   TrialSpawnerState tick(BlockPos pos, TrialSpawnerLogic logic, ServerWorld world) {
+      TrialSpawnerData lv = logic.getData();
+      TrialSpawnerConfig lv2 = logic.getConfig();
       TrialSpawnerState var10000;
       switch (this) {
          case INACTIVE:
-            var10000 = lv.getOrCreateDisplayEntity(arg2, world, WAITING_FOR_PLAYERS) == null ? this : WAITING_FOR_PLAYERS;
+            var10000 = lv.getOrCreateDisplayEntity(logic, world, WAITING_FOR_PLAYERS) == null ? this : WAITING_FOR_PLAYERS;
             break;
          case WAITING_FOR_PLAYERS:
-            if (!lv.hasSpawnData(arg2, world.random)) {
+            if (!lv.hasSpawnData(logic, world.random)) {
                var10000 = INACTIVE;
             } else {
-               lv.detectPlayers(world, pos, arg2);
+               lv.detectPlayers(world, pos, logic);
                var10000 = lv.registeredPlayers.isEmpty() ? this : ACTIVE;
             }
             break;
          case ACTIVE:
-            if (!lv.hasSpawnData(arg2, world.random)) {
+            if (!lv.hasSpawnData(logic, world.random)) {
                var10000 = INACTIVE;
             } else {
                int i = lv.getAdditionalPlayers(pos);
-               lv.detectPlayers(world, pos, arg2);
-               if (arg2.m_dgbojbgg()) {
-                  this.m_mlumwbvs(world, pos, arg2);
+               lv.detectPlayers(world, pos, logic);
+               if (logic.isOminous()) {
+                  this.m_mlumwbvs(world, pos, logic);
                }
 
                if (lv.hasSpawnedAllMobs(lv2, i)) {
                   if (lv.areMobsDead()) {
-                     lv.cooldownEndTime = world.getTime() + (long)arg2.getTargetCooldownLength();
+                     lv.cooldownEndTime = world.getTime() + (long)logic.getTargetCooldownLength();
                      lv.totalMobsSpawned = 0;
                      lv.nextMobSpawnTime = 0L;
                      var10000 = WAITING_FOR_REWARD_EJECTION;
                      break;
                   }
                } else if (lv.isReadyToSpawnNewMobs(world, lv2, i)) {
-                  arg2.spawnMob(world, pos).ifPresent(uuid -> {
+                  logic.spawnMob(world, pos).ifPresent(uuid -> {
                      lv.currentMobs.add(uuid);
                      lv.totalMobsSpawned++;
                      lv.nextMobSpawnTime = world.getTime() + (long)lv2.ticksBetweenSpawn();
                      lv2.spawnPotentialsDefinition().getOrEmpty(world.getRandom()).ifPresent(spawnData -> {
                         lv.spawnData = Optional.of((MobSpawnerEntry)spawnData.data());
-                        arg2.updateListeners();
+                        logic.updateListeners();
                      });
                   });
                }
@@ -169,7 +169,7 @@
             }
             break;
          case WAITING_FOR_REWARD_EJECTION:
-            if (lv.isReadyToOpenShutter(world, 40.0F, arg2.getTargetCooldownLength())) {
+            if (lv.isReadyToOpenShutter(world, 40.0F, logic.getTargetCooldownLength())) {
                world.playSound(null, pos, SoundEvents.BLOCK_TRIAL_SPAWNER_OPEN_SHUTTER, SoundCategory.BLOCKS);
                var10000 = EJECTING_REWARD;
             } else {
@@ -177,7 +177,7 @@
             }
             break;
          case EJECTING_REWARD:
-            if (!lv.isReadyToEjectReward(world, (float)REWARD_EJECTION_DELAY, arg2.getTargetCooldownLength())) {
+            if (!lv.isReadyToEjectReward(world, (float)REWARD_EJECTION_DELAY, logic.getTargetCooldownLength())) {
                var10000 = this;
             } else if (lv.registeredPlayers.isEmpty()) {
                world.playSound(null, pos, SoundEvents.BLOCK_TRIAL_SPAWNER_CLOSE_SHUTTER, SoundCategory.BLOCKS);
@@ -188,20 +188,20 @@
                   lv.ejectingLootTable = lv2.lootTablesToEject().getDataOrEmpty(world.getRandom());
                }
 
-               lv.ejectingLootTable.ifPresent(registryKey -> arg2.ejectLoot(world, pos, registryKey));
+               lv.ejectingLootTable.ifPresent(registryKey -> logic.ejectLoot(world, pos, registryKey));
                lv.registeredPlayers.remove(lv.registeredPlayers.iterator().next());
                var10000 = this;
             }
             break;
          case COOLDOWN:
-            lv.detectPlayers(world, pos, arg2);
+            lv.detectPlayers(world, pos, logic);
             if (!lv.registeredPlayers.isEmpty()) {
                lv.totalMobsSpawned = 0;
                lv.nextMobSpawnTime = 0L;
                var10000 = ACTIVE;
             } else if (lv.isCooldownFinished(world)) {
                lv.cooldownEndTime = 0L;
-               arg2.m_nszglagl(world, pos);
+               logic.m_nszglagl(world, pos);
                var10000 = WAITING_FOR_PLAYERS;
             } else {
                var10000 = this;
@@ -225,12 +225,12 @@
       if (!lv3.isEmpty()) {
          if (this.m_qeqintcw(world, lv)) {
             m_drqhttao(world, pos, arg3, lv).ifPresent(arg5 -> {
-               C_czxrapyw lvx = C_czxrapyw.m_hbpvxart(world, lv3);
+               OminousItemSpawnerEntity lvx = OminousItemSpawnerEntity.m_hbpvxart(world, lv3);
                lvx.refreshPositionAfterTeleport(arg5);
                world.spawnEntity(lvx);
                float f = (world.getRandom().nextFloat() - world.getRandom().nextFloat()) * 0.2F + 1.0F;
                world.playSound(null, BlockPos.fromPosition(arg5), SoundEvents.BLOCK_TRIAL_SPAWNER_SPAWN_ITEM_BEGIN, SoundCategory.BLOCKS, 1.0F, f);
-               lv.cooldownEndTime = world.getTime() + arg3.m_hxfvrqzw().m_rjwfxsix();
+               lv.cooldownEndTime = world.getTime() + arg3.getOminousConfig().m_rjwfxsix();
             });
          }
       }
@@ -291,8 +291,8 @@
     * @mapping {@literal hashed m_qeqintcw Lnet/minecraft/unmapped/C_mefvrcdp;m_qeqintcw(Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_kxkfzuix;)Z}
     * @mapping {@literal named m_qeqintcw Lnet/minecraft/block/enums/TrialSpawnerState;m_qeqintcw(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/block/TrialSpawnerData;)Z}
     */
-   private boolean m_qeqintcw(ServerWorld world, TrialSpawnerData arg2) {
-      return world.getTime() >= arg2.cooldownEndTime;
+   private boolean m_qeqintcw(ServerWorld world, TrialSpawnerData spawnerData) {
+      return world.getTime() >= spawnerData.cooldownEndTime;
    }
 
    /**
@@ -331,8 +331,8 @@
     * @mapping {@literal hashed m_epcfmecd Lnet/minecraft/unmapped/C_mefvrcdp;m_epcfmecd(Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Z)V}
     * @mapping {@literal named emitParticle Lnet/minecraft/block/enums/TrialSpawnerState;emitParticle(Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;Z)V}
     */
-   public void emitParticle(World world, BlockPos pos, boolean bl) {
-      this.particleEmitter.emit(world, world.getRandom(), pos, bl);
+   public void emitParticle(World world, BlockPos pos, boolean ominous) {
+      this.particleEmitter.emit(world, world.getRandom(), pos, ominous);
    }
 
    /**
@@ -461,6 +461,6 @@
        * @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;Z)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;Z)V}
        */
-      void emit(World world, RandomGenerator random, BlockPos pos, boolean bl);
+      void emit(World world, RandomGenerator random, BlockPos pos, boolean ominous);
    }
 }
diff -bur namedTargetSrc/net/minecraft/block/sculk/SculkSensorBlock.java namedSrc/net/minecraft/block/sculk/SculkSensorBlock.java
--- namedTargetSrc/net/minecraft/block/sculk/SculkSensorBlock.java	2024-04-02 02:33:24.344587874 +0000
+++ namedSrc/net/minecraft/block/sculk/SculkSensorBlock.java	2024-04-02 02:32:14.800106533 +0000
@@ -167,7 +167,7 @@
          && world.getBlockEntity(pos) instanceof SculkSensorBlockEntity lv2
          && world instanceof ServerWorld lv3
          && lv2.getVibrationCallback().accepts(lv3, pos, GameEvent.STEP, GameEvent.Context.create(state))) {
-         lv2.m_duureayn().forceScheduleVibration(lv3, GameEvent.STEP, GameEvent.Context.create(entity), entity.getPos());
+         lv2.getListener().forceScheduleVibration(lv3, GameEvent.STEP, GameEvent.Context.create(entity), entity.getPos());
       }
 
       super.onSteppedOn(world, pos, state, entity);
diff -bur namedTargetSrc/net/minecraft/block/TrialSpawnerData.java namedSrc/net/minecraft/block/TrialSpawnerData.java
--- namedTargetSrc/net/minecraft/block/TrialSpawnerData.java	2024-04-02 02:33:24.248587262 +0000
+++ namedSrc/net/minecraft/block/TrialSpawnerData.java	2024-04-02 02:32:14.688105694 +0000
@@ -231,7 +231,7 @@
    public void detectPlayers(ServerWorld world, BlockPos pos, TrialSpawnerLogic arg3) {
       boolean bl = (pos.asLong() + world.getTime()) % 20L != 0L;
       if (!bl) {
-         if (!arg3.getState().equals(TrialSpawnerState.COOLDOWN) || !arg3.m_dgbojbgg()) {
+         if (!arg3.getState().equals(TrialSpawnerState.COOLDOWN) || !arg3.isOminous()) {
             List<UUID> list = arg3.getPlayerDetector().detect(world, arg3.getPlayerDetectionSelector(), pos, (double)arg3.getRequiredPlayerRange(), true);
             PlayerEntity lv = null;
 
@@ -247,7 +247,7 @@
                }
             }
 
-            boolean bl2 = !arg3.m_dgbojbgg() && lv != null;
+            boolean bl2 = !arg3.isOminous() && lv != null;
             if (!arg3.getState().equals(TrialSpawnerState.COOLDOWN) || bl2) {
                if (bl2) {
                   world.syncWorldEvent(3020, BlockPos.fromPosition(lv.getEyePos()), 0);
@@ -261,7 +261,7 @@
                if (this.registeredPlayers.addAll(list2)) {
                   this.nextMobSpawnTime = Math.max(world.getTime() + 40L, this.nextMobSpawnTime);
                   if (!bl2) {
-                     int i = arg3.m_dgbojbgg() ? 3019 : WorldEvents.TRIAL_SPAWNER_DETECTS_PLAYER;
+                     int i = arg3.isOminous() ? 3019 : WorldEvents.TRIAL_SPAWNER_DETECTS_PLAYER;
                      world.syncWorldEvent(i, pos, this.registeredPlayers.size());
                   }
                }
@@ -281,15 +281,15 @@
             arg2.remove(Entity.RemovalReason.DISCARDED);
          }
       });
-      if (!arg.m_hxfvrqzw().spawnPotentialsDefinition().isEmpty()) {
+      if (!arg.getOminousConfig().spawnPotentialsDefinition().isEmpty()) {
          this.spawnData = Optional.empty();
       }
 
       this.totalMobsSpawned = 0;
       this.currentMobs.clear();
-      this.nextMobSpawnTime = world.getTime() + (long)arg.m_hxfvrqzw().ticksBetweenSpawn();
+      this.nextMobSpawnTime = world.getTime() + (long)arg.getOminousConfig().ticksBetweenSpawn();
       arg.updateListeners();
-      this.cooldownEndTime = world.getTime() + arg.m_hxfvrqzw().m_rjwfxsix();
+      this.cooldownEndTime = world.getTime() + arg.getOminousConfig().m_rjwfxsix();
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/data/report/BiomeParametersProvider.java namedSrc/net/minecraft/data/report/BiomeParametersProvider.java
--- namedTargetSrc/net/minecraft/data/report/BiomeParametersProvider.java	2024-04-02 02:33:24.004585708 +0000
+++ namedSrc/net/minecraft/data/report/BiomeParametersProvider.java	2024-04-02 02:32:14.432103777 +0000
@@ -76,7 +76,7 @@
             arg2 -> {
                DynamicOps<JsonElement> dynamicOps = arg2.createSerializationContext(JsonOps.INSTANCE);
                List<CompletableFuture<?>> list = new ArrayList();
-               MultiNoiseBiomeSourceParameterList.m_dhdwhiqm()
+               MultiNoiseBiomeSourceParameterList.getKnownPresets()
                   .forEach((arg2x, arg3) -> list.add(write(this.resolveFile(arg2x.id()), writer, dynamicOps, CODEC, arg3)));
                return CompletableFuture.allOf((CompletableFuture[])list.toArray(CompletableFuture[]::new));
             }
diff -bur namedTargetSrc/net/minecraft/entity/EntityType.java namedSrc/net/minecraft/entity/EntityType.java
--- namedTargetSrc/net/minecraft/entity/EntityType.java	2024-04-02 02:33:24.048585988 +0000
+++ namedSrc/net/minecraft/entity/EntityType.java	2024-04-02 02:32:14.488104196 +0000
@@ -152,7 +152,6 @@
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.text.Text;
-import net.minecraft.unmapped.C_czxrapyw;
 import net.minecraft.unmapped.C_pubtmkke;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.TypeFilter;
@@ -806,9 +805,12 @@
     * @mapping {@literal hashed f_zmuielaq Lnet/minecraft/unmapped/C_ogavsvbr;f_zmuielaq:Lnet/minecraft/unmapped/C_ogavsvbr;}
     * @mapping {@literal named OMINOUS_ITEM_SPAWNER Lnet/minecraft/entity/EntityType;OMINOUS_ITEM_SPAWNER:Lnet/minecraft/entity/EntityType;}
     */
-   public static final EntityType<C_czxrapyw> OMINOUS_ITEM_SPAWNER = register(
+   public static final EntityType<OminousItemSpawnerEntity> OMINOUS_ITEM_SPAWNER = register(
       "ominous_item_spawner",
-      EntityType.Builder.create(C_czxrapyw::new, SpawnGroup.MISC).setDimensions(0.25F, 0.25F).maxTrackingRange(8).requiredFlags(FeatureFlags.UPDATE_1_21)
+      EntityType.Builder.create(OminousItemSpawnerEntity::new, SpawnGroup.MISC)
+         .setDimensions(0.25F, 0.25F)
+         .maxTrackingRange(8)
+         .requiredFlags(FeatureFlags.UPDATE_1_21)
    );
    /**
     * @mapping {@literal hashed f_vdfbveor Lnet/minecraft/unmapped/C_ogavsvbr;f_vdfbveor:Lnet/minecraft/unmapped/C_ogavsvbr;}
Only in namedSrc/net/minecraft/entity: OminousItemSpawnerEntity.java
diff -bur namedTargetSrc/net/minecraft/item/ArrowItem.java namedSrc/net/minecraft/item/ArrowItem.java
--- namedTargetSrc/net/minecraft/item/ArrowItem.java	2024-04-02 02:33:24.288587517 +0000
+++ namedSrc/net/minecraft/item/ArrowItem.java	2024-04-02 02:32:14.732106024 +0000
@@ -4,7 +4,6 @@
 import net.minecraft.entity.projectile.ArrowEntity;
 import net.minecraft.entity.projectile.PersistentProjectileEntity;
 import net.minecraft.entity.projectile.ProjectileEntity;
-import net.minecraft.unmapped.C_dokwmwgh;
 import net.minecraft.util.math.Direction;
 import net.minecraft.util.math.Position;
 import net.minecraft.world.World;
@@ -13,7 +12,7 @@
  * @mapping {@literal hashed net/minecraft/unmapped/C_qdrvdocr}
  * @mapping {@literal named net/minecraft/item/ArrowItem}
  */
-public class ArrowItem extends Item implements C_dokwmwgh {
+public class ArrowItem extends Item implements ProjectileItem {
    /**
     * Mapping not found
     */
@@ -30,12 +29,11 @@
    }
 
    /**
-    * @mapping {@literal hashed m_dxnfepcn Lnet/minecraft/unmapped/C_qdrvdocr;m_dxnfepcn(Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_ogbhoqwb;Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_xpuuihxf;)Lnet/minecraft/unmapped/C_ltpsyvhj;}
-    * @mapping {@literal named m_dxnfepcn Lnet/minecraft/item/ArrowItem;m_dxnfepcn(Lnet/minecraft/world/World;Lnet/minecraft/util/math/Position;Lnet/minecraft/item/ItemStack;Lnet/minecraft/util/math/Direction;)Lnet/minecraft/entity/projectile/ProjectileEntity;}
+    * Mapping not found
     */
    @Override
-   public ProjectileEntity m_dxnfepcn(World world, Position arg2, ItemStack stack, Direction direction) {
-      ArrowEntity lv = new ArrowEntity(world, arg2.getX(), arg2.getY(), arg2.getZ(), stack.copyWithCount(1));
+   public ProjectileEntity createEntity(World world, Position pos, ItemStack stack, Direction direction) {
+      ArrowEntity lv = new ArrowEntity(world, pos.getX(), pos.getY(), pos.getZ(), stack.copyWithCount(1));
       lv.pickupType = PersistentProjectileEntity.PickupPermission.ALLOWED;
       return lv;
    }
diff -bur namedTargetSrc/net/minecraft/item/EggItem.java namedSrc/net/minecraft/item/EggItem.java
--- namedTargetSrc/net/minecraft/item/EggItem.java	2024-04-02 02:33:24.272587415 +0000
+++ namedSrc/net/minecraft/item/EggItem.java	2024-04-02 02:32:14.716105904 +0000
@@ -6,7 +6,6 @@
 import net.minecraft.sound.SoundCategory;
 import net.minecraft.sound.SoundEvents;
 import net.minecraft.stat.Stats;
-import net.minecraft.unmapped.C_dokwmwgh;
 import net.minecraft.util.Hand;
 import net.minecraft.util.TypedActionResult;
 import net.minecraft.util.math.Direction;
@@ -17,7 +16,7 @@
  * @mapping {@literal hashed net/minecraft/unmapped/C_hwkcpzzx}
  * @mapping {@literal named net/minecraft/item/EggItem}
  */
-public class EggItem extends Item implements C_dokwmwgh {
+public class EggItem extends Item implements ProjectileItem {
    /**
     * Mapping not found
     */
@@ -54,12 +53,11 @@
    }
 
    /**
-    * @mapping {@literal hashed m_dxnfepcn Lnet/minecraft/unmapped/C_hwkcpzzx;m_dxnfepcn(Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_ogbhoqwb;Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_xpuuihxf;)Lnet/minecraft/unmapped/C_ltpsyvhj;}
-    * @mapping {@literal named m_dxnfepcn Lnet/minecraft/item/EggItem;m_dxnfepcn(Lnet/minecraft/world/World;Lnet/minecraft/util/math/Position;Lnet/minecraft/item/ItemStack;Lnet/minecraft/util/math/Direction;)Lnet/minecraft/entity/projectile/ProjectileEntity;}
+    * Mapping not found
     */
    @Override
-   public ProjectileEntity m_dxnfepcn(World world, Position arg2, ItemStack stack, Direction direction) {
-      EggEntity lv = new EggEntity(world, arg2.getX(), arg2.getY(), arg2.getZ());
+   public ProjectileEntity createEntity(World world, Position pos, ItemStack stack, Direction direction) {
+      EggEntity lv = new EggEntity(world, pos.getX(), pos.getY(), pos.getZ());
       lv.setItem(stack);
       return lv;
    }
diff -bur namedTargetSrc/net/minecraft/item/ExperienceBottleItem.java namedSrc/net/minecraft/item/ExperienceBottleItem.java
--- namedTargetSrc/net/minecraft/item/ExperienceBottleItem.java	2024-04-02 02:33:24.344587874 +0000
+++ namedSrc/net/minecraft/item/ExperienceBottleItem.java	2024-04-02 02:32:14.800106533 +0000
@@ -6,7 +6,6 @@
 import net.minecraft.sound.SoundCategory;
 import net.minecraft.sound.SoundEvents;
 import net.minecraft.stat.Stats;
-import net.minecraft.unmapped.C_dokwmwgh;
 import net.minecraft.util.Hand;
 import net.minecraft.util.TypedActionResult;
 import net.minecraft.util.math.Direction;
@@ -17,7 +16,7 @@
  * @mapping {@literal hashed net/minecraft/unmapped/C_lqqhjfgp}
  * @mapping {@literal named net/minecraft/item/ExperienceBottleItem}
  */
-public class ExperienceBottleItem extends Item implements C_dokwmwgh {
+public class ExperienceBottleItem extends Item implements ProjectileItem {
    /**
     * Mapping not found
     */
@@ -54,12 +53,11 @@
    }
 
    /**
-    * @mapping {@literal hashed m_dxnfepcn Lnet/minecraft/unmapped/C_lqqhjfgp;m_dxnfepcn(Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_ogbhoqwb;Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_xpuuihxf;)Lnet/minecraft/unmapped/C_ltpsyvhj;}
-    * @mapping {@literal named m_dxnfepcn Lnet/minecraft/item/ExperienceBottleItem;m_dxnfepcn(Lnet/minecraft/world/World;Lnet/minecraft/util/math/Position;Lnet/minecraft/item/ItemStack;Lnet/minecraft/util/math/Direction;)Lnet/minecraft/entity/projectile/ProjectileEntity;}
+    * Mapping not found
     */
    @Override
-   public ProjectileEntity m_dxnfepcn(World world, Position arg2, ItemStack stack, Direction direction) {
-      ExperienceBottleEntity lv = new ExperienceBottleEntity(world, arg2.getX(), arg2.getY(), arg2.getZ());
+   public ProjectileEntity createEntity(World world, Position pos, ItemStack stack, Direction direction) {
+      ExperienceBottleEntity lv = new ExperienceBottleEntity(world, pos.getX(), pos.getY(), pos.getZ());
       lv.setItem(stack);
       return lv;
    }
@@ -68,10 +66,10 @@
     * Mapping not found
     */
    @Override
-   public C_dokwmwgh.C_jscrvllj m_kzimfaao() {
-      return C_dokwmwgh.C_jscrvllj.m_lfokgmwh()
-         .m_nxfppizk(C_dokwmwgh.C_jscrvllj.f_gnbrqqah.uncertainty() * 0.5F)
-         .m_estpjtyu(C_dokwmwgh.C_jscrvllj.f_gnbrqqah.power() * 1.25F)
-         .m_chenqixq();
+   public ProjectileItem.DispenserConfig createDispenserConfig() {
+      return ProjectileItem.DispenserConfig.builder()
+         .uncertainty(ProjectileItem.DispenserConfig.DEFAULT.uncertainty() * 0.5F)
+         .power(ProjectileItem.DispenserConfig.DEFAULT.power() * 1.25F)
+         .build();
    }
 }
diff -bur namedTargetSrc/net/minecraft/item/FireChargeItem.java namedSrc/net/minecraft/item/FireChargeItem.java
--- namedTargetSrc/net/minecraft/item/FireChargeItem.java	2024-04-02 02:33:24.280587466 +0000
+++ namedSrc/net/minecraft/item/FireChargeItem.java	2024-04-02 02:32:14.724105964 +0000
@@ -11,7 +11,6 @@
 import net.minecraft.sound.SoundCategory;
 import net.minecraft.sound.SoundEvents;
 import net.minecraft.state.property.Properties;
-import net.minecraft.unmapped.C_dokwmwgh;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
@@ -25,7 +24,7 @@
  * @mapping {@literal hashed net/minecraft/unmapped/C_dnvcxhwh}
  * @mapping {@literal named net/minecraft/item/FireChargeItem}
  */
-public class FireChargeItem extends Item implements C_dokwmwgh {
+public class FireChargeItem extends Item implements ProjectileItem {
    /**
     * Mapping not found
     */
@@ -75,16 +74,15 @@
    }
 
    /**
-    * @mapping {@literal hashed m_dxnfepcn Lnet/minecraft/unmapped/C_dnvcxhwh;m_dxnfepcn(Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_ogbhoqwb;Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_xpuuihxf;)Lnet/minecraft/unmapped/C_ltpsyvhj;}
-    * @mapping {@literal named m_dxnfepcn Lnet/minecraft/item/FireChargeItem;m_dxnfepcn(Lnet/minecraft/world/World;Lnet/minecraft/util/math/Position;Lnet/minecraft/item/ItemStack;Lnet/minecraft/util/math/Direction;)Lnet/minecraft/entity/projectile/ProjectileEntity;}
+    * Mapping not found
     */
    @Override
-   public ProjectileEntity m_dxnfepcn(World world, Position arg2, ItemStack stack, Direction direction) {
+   public ProjectileEntity createEntity(World world, Position pos, ItemStack stack, Direction direction) {
       RandomGenerator lv = world.getRandom();
       double d = lv.nextTriangular((double)direction.getOffsetX(), 0.11485000000000001);
       double e = lv.nextTriangular((double)direction.getOffsetY(), 0.11485000000000001);
       double f = lv.nextTriangular((double)direction.getOffsetZ(), 0.11485000000000001);
-      SmallFireballEntity lv2 = new SmallFireballEntity(world, arg2.getX(), arg2.getY(), arg2.getZ(), d, e, f);
+      SmallFireballEntity lv2 = new SmallFireballEntity(world, pos.getX(), pos.getY(), pos.getZ(), d, e, f);
       lv2.setItem(stack);
       return lv2;
    }
@@ -93,19 +91,19 @@
     * Mapping not found
     */
    @Override
-   public void m_mruwcksw(ProjectileEntity arg, double d, double e, double f, float g, float h) {
+   public void initialiseProjectile(ProjectileEntity projectile, double x, double y, double z, float speed, float divergence) {
    }
 
    /**
     * Mapping not found
     */
    @Override
-   public C_dokwmwgh.C_jscrvllj m_kzimfaao() {
-      return C_dokwmwgh.C_jscrvllj.m_lfokgmwh()
-         .m_dqjwnijh((arg, direction) -> DispenserBlock.m_kmtowdxh(arg, 1.0, Vec3d.ZERO))
-         .m_nxfppizk(6.6666665F)
-         .m_estpjtyu(1.0F)
-         .m_somgfudg(1018)
-         .m_chenqixq();
+   public ProjectileItem.DispenserConfig createDispenserConfig() {
+      return ProjectileItem.DispenserConfig.builder()
+         .positionFunction((arg, direction) -> DispenserBlock.m_kmtowdxh(arg, 1.0, Vec3d.ZERO))
+         .uncertainty(6.6666665F)
+         .power(1.0F)
+         .overrideDispenseBehavior(1018)
+         .build();
    }
 }
diff -bur namedTargetSrc/net/minecraft/item/FireworkRocketItem.java namedSrc/net/minecraft/item/FireworkRocketItem.java
--- namedTargetSrc/net/minecraft/item/FireworkRocketItem.java	2024-04-02 02:33:24.228587135 +0000
+++ namedSrc/net/minecraft/item/FireworkRocketItem.java	2024-04-02 02:32:14.668105545 +0000
@@ -10,7 +10,6 @@
 import net.minecraft.entity.projectile.ProjectileEntity;
 import net.minecraft.stat.Stats;
 import net.minecraft.text.Text;
-import net.minecraft.unmapped.C_dokwmwgh;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.Hand;
 import net.minecraft.util.TypedActionResult;
@@ -25,7 +24,7 @@
  * @mapping {@literal hashed net/minecraft/unmapped/C_gulyzcrd}
  * @mapping {@literal named net/minecraft/item/FireworkRocketItem}
  */
-public class FireworkRocketItem extends Item implements C_dokwmwgh {
+public class FireworkRocketItem extends Item implements ProjectileItem {
    /**
     * @mapping {@literal hashed f_yheuuune Lnet/minecraft/unmapped/C_gulyzcrd;f_yheuuune:[B}
     * @mapping {@literal named FLIGHT_DURATIONS Lnet/minecraft/item/FireworkRocketItem;FLIGHT_DURATIONS:[B}
@@ -101,20 +100,24 @@
    }
 
    /**
-    * @mapping {@literal hashed m_dxnfepcn Lnet/minecraft/unmapped/C_gulyzcrd;m_dxnfepcn(Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_ogbhoqwb;Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_xpuuihxf;)Lnet/minecraft/unmapped/C_ltpsyvhj;}
-    * @mapping {@literal named m_dxnfepcn Lnet/minecraft/item/FireworkRocketItem;m_dxnfepcn(Lnet/minecraft/world/World;Lnet/minecraft/util/math/Position;Lnet/minecraft/item/ItemStack;Lnet/minecraft/util/math/Direction;)Lnet/minecraft/entity/projectile/ProjectileEntity;}
+    * Mapping not found
     */
    @Override
-   public ProjectileEntity m_dxnfepcn(World world, Position arg2, ItemStack stack, Direction direction) {
-      return new FireworkRocketEntity(world, stack.copyWithCount(1), arg2.getX(), arg2.getY(), arg2.getZ(), true);
+   public ProjectileEntity createEntity(World world, Position pos, ItemStack stack, Direction direction) {
+      return new FireworkRocketEntity(world, stack.copyWithCount(1), pos.getX(), pos.getY(), pos.getZ(), true);
    }
 
    /**
     * Mapping not found
     */
    @Override
-   public C_dokwmwgh.C_jscrvllj m_kzimfaao() {
-      return C_dokwmwgh.C_jscrvllj.m_lfokgmwh().m_dqjwnijh(FireworkRocketItem::m_riuzgxzd).m_nxfppizk(0.5F).m_estpjtyu(1.0F).m_somgfudg(1004).m_chenqixq();
+   public ProjectileItem.DispenserConfig createDispenserConfig() {
+      return ProjectileItem.DispenserConfig.builder()
+         .positionFunction(FireworkRocketItem::m_riuzgxzd)
+         .uncertainty(0.5F)
+         .power(1.0F)
+         .overrideDispenseBehavior(1004)
+         .build();
    }
 
    /**
Only in namedSrc/net/minecraft/item: ProjectileItem.java
diff -bur namedTargetSrc/net/minecraft/item/SnowballItem.java namedSrc/net/minecraft/item/SnowballItem.java
--- namedTargetSrc/net/minecraft/item/SnowballItem.java	2024-04-02 02:33:24.316587696 +0000
+++ namedSrc/net/minecraft/item/SnowballItem.java	2024-04-02 02:32:14.764106263 +0000
@@ -6,7 +6,6 @@
 import net.minecraft.sound.SoundCategory;
 import net.minecraft.sound.SoundEvents;
 import net.minecraft.stat.Stats;
-import net.minecraft.unmapped.C_dokwmwgh;
 import net.minecraft.util.Hand;
 import net.minecraft.util.TypedActionResult;
 import net.minecraft.util.math.Direction;
@@ -17,7 +16,7 @@
  * @mapping {@literal hashed net/minecraft/unmapped/C_twkepvnk}
  * @mapping {@literal named net/minecraft/item/SnowballItem}
  */
-public class SnowballItem extends Item implements C_dokwmwgh {
+public class SnowballItem extends Item implements ProjectileItem {
    /**
     * Mapping not found
     */
@@ -54,12 +53,11 @@
    }
 
    /**
-    * @mapping {@literal hashed m_dxnfepcn Lnet/minecraft/unmapped/C_twkepvnk;m_dxnfepcn(Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_ogbhoqwb;Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_xpuuihxf;)Lnet/minecraft/unmapped/C_ltpsyvhj;}
-    * @mapping {@literal named m_dxnfepcn Lnet/minecraft/item/SnowballItem;m_dxnfepcn(Lnet/minecraft/world/World;Lnet/minecraft/util/math/Position;Lnet/minecraft/item/ItemStack;Lnet/minecraft/util/math/Direction;)Lnet/minecraft/entity/projectile/ProjectileEntity;}
+    * Mapping not found
     */
    @Override
-   public ProjectileEntity m_dxnfepcn(World world, Position arg2, ItemStack stack, Direction direction) {
-      SnowballEntity lv = new SnowballEntity(world, arg2.getX(), arg2.getY(), arg2.getZ());
+   public ProjectileEntity createEntity(World world, Position pos, ItemStack stack, Direction direction) {
+      SnowballEntity lv = new SnowballEntity(world, pos.getX(), pos.getY(), pos.getZ());
       lv.setItem(stack);
       return lv;
    }
diff -bur namedTargetSrc/net/minecraft/item/SpectralArrowItem.java namedSrc/net/minecraft/item/SpectralArrowItem.java
--- namedTargetSrc/net/minecraft/item/SpectralArrowItem.java	2024-04-02 02:33:24.060586064 +0000
+++ namedSrc/net/minecraft/item/SpectralArrowItem.java	2024-04-02 02:32:14.504104317 +0000
@@ -29,12 +29,11 @@
    }
 
    /**
-    * @mapping {@literal hashed m_dxnfepcn Lnet/minecraft/unmapped/C_jqjsygsv;m_dxnfepcn(Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_ogbhoqwb;Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_xpuuihxf;)Lnet/minecraft/unmapped/C_ltpsyvhj;}
-    * @mapping {@literal named m_dxnfepcn Lnet/minecraft/item/SpectralArrowItem;m_dxnfepcn(Lnet/minecraft/world/World;Lnet/minecraft/util/math/Position;Lnet/minecraft/item/ItemStack;Lnet/minecraft/util/math/Direction;)Lnet/minecraft/entity/projectile/ProjectileEntity;}
+    * Mapping not found
     */
    @Override
-   public ProjectileEntity m_dxnfepcn(World world, Position arg2, ItemStack stack, Direction direction) {
-      SpectralArrowEntity lv = new SpectralArrowEntity(world, arg2.getX(), arg2.getY(), arg2.getZ(), stack.copyWithCount(1));
+   public ProjectileEntity createEntity(World world, Position pos, ItemStack stack, Direction direction) {
+      SpectralArrowEntity lv = new SpectralArrowEntity(world, pos.getX(), pos.getY(), pos.getZ(), stack.copyWithCount(1));
       lv.pickupType = PersistentProjectileEntity.PickupPermission.ALLOWED;
       return lv;
    }
diff -bur namedTargetSrc/net/minecraft/item/ThrowablePotionItem.java namedSrc/net/minecraft/item/ThrowablePotionItem.java
--- namedTargetSrc/net/minecraft/item/ThrowablePotionItem.java	2024-04-02 02:33:24.352587925 +0000
+++ namedSrc/net/minecraft/item/ThrowablePotionItem.java	2024-04-02 02:32:14.812106623 +0000
@@ -4,7 +4,6 @@
 import net.minecraft.entity.projectile.ProjectileEntity;
 import net.minecraft.entity.projectile.thrown.PotionEntity;
 import net.minecraft.stat.Stats;
-import net.minecraft.unmapped.C_dokwmwgh;
 import net.minecraft.util.Hand;
 import net.minecraft.util.TypedActionResult;
 import net.minecraft.util.math.Direction;
@@ -15,7 +14,7 @@
  * @mapping {@literal hashed net/minecraft/unmapped/C_swiiwnqd}
  * @mapping {@literal named net/minecraft/item/ThrowablePotionItem}
  */
-public class ThrowablePotionItem extends PotionItem implements C_dokwmwgh {
+public class ThrowablePotionItem extends PotionItem implements ProjectileItem {
    /**
     * Mapping not found
     */
@@ -42,12 +41,11 @@
    }
 
    /**
-    * @mapping {@literal hashed m_dxnfepcn Lnet/minecraft/unmapped/C_swiiwnqd;m_dxnfepcn(Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_ogbhoqwb;Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_xpuuihxf;)Lnet/minecraft/unmapped/C_ltpsyvhj;}
-    * @mapping {@literal named m_dxnfepcn Lnet/minecraft/item/ThrowablePotionItem;m_dxnfepcn(Lnet/minecraft/world/World;Lnet/minecraft/util/math/Position;Lnet/minecraft/item/ItemStack;Lnet/minecraft/util/math/Direction;)Lnet/minecraft/entity/projectile/ProjectileEntity;}
+    * Mapping not found
     */
    @Override
-   public ProjectileEntity m_dxnfepcn(World world, Position arg2, ItemStack stack, Direction direction) {
-      PotionEntity lv = new PotionEntity(world, arg2.getX(), arg2.getY(), arg2.getZ());
+   public ProjectileEntity createEntity(World world, Position pos, ItemStack stack, Direction direction) {
+      PotionEntity lv = new PotionEntity(world, pos.getX(), pos.getY(), pos.getZ());
       lv.setItem(stack);
       return lv;
    }
@@ -56,10 +54,10 @@
     * Mapping not found
     */
    @Override
-   public C_dokwmwgh.C_jscrvllj m_kzimfaao() {
-      return C_dokwmwgh.C_jscrvllj.m_lfokgmwh()
-         .m_nxfppizk(C_dokwmwgh.C_jscrvllj.f_gnbrqqah.uncertainty() * 0.5F)
-         .m_estpjtyu(C_dokwmwgh.C_jscrvllj.f_gnbrqqah.power() * 1.25F)
-         .m_chenqixq();
+   public ProjectileItem.DispenserConfig createDispenserConfig() {
+      return ProjectileItem.DispenserConfig.builder()
+         .uncertainty(ProjectileItem.DispenserConfig.DEFAULT.uncertainty() * 0.5F)
+         .power(ProjectileItem.DispenserConfig.DEFAULT.power() * 1.25F)
+         .build();
    }
 }
diff -bur namedTargetSrc/net/minecraft/item/TridentItem.java namedSrc/net/minecraft/item/TridentItem.java
--- namedTargetSrc/net/minecraft/item/TridentItem.java	2024-04-02 02:33:24.128586498 +0000
+++ namedSrc/net/minecraft/item/TridentItem.java	2024-04-02 02:32:14.584104915 +0000
@@ -18,7 +18,6 @@
 import net.minecraft.sound.SoundEvent;
 import net.minecraft.sound.SoundEvents;
 import net.minecraft.stat.Stats;
-import net.minecraft.unmapped.C_dokwmwgh;
 import net.minecraft.unmapped.C_uippejmz;
 import net.minecraft.util.Hand;
 import net.minecraft.util.TypedActionResult;
@@ -34,7 +33,7 @@
  * @mapping {@literal hashed net/minecraft/unmapped/C_zmjbcbkb}
  * @mapping {@literal named net/minecraft/item/TridentItem}
  */
-public class TridentItem extends Item implements C_dokwmwgh {
+public class TridentItem extends Item implements ProjectileItem {
    /**
     * @mapping {@literal hashed f_doufocix Lnet/minecraft/unmapped/C_zmjbcbkb;f_doufocix:I}
     * @mapping {@literal named THROW_THRESHOLD_TIME Lnet/minecraft/item/TridentItem;THROW_THRESHOLD_TIME:I}
@@ -203,12 +202,11 @@
    }
 
    /**
-    * @mapping {@literal hashed m_dxnfepcn Lnet/minecraft/unmapped/C_zmjbcbkb;m_dxnfepcn(Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_ogbhoqwb;Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_xpuuihxf;)Lnet/minecraft/unmapped/C_ltpsyvhj;}
-    * @mapping {@literal named m_dxnfepcn Lnet/minecraft/item/TridentItem;m_dxnfepcn(Lnet/minecraft/world/World;Lnet/minecraft/util/math/Position;Lnet/minecraft/item/ItemStack;Lnet/minecraft/util/math/Direction;)Lnet/minecraft/entity/projectile/ProjectileEntity;}
+    * Mapping not found
     */
    @Override
-   public ProjectileEntity m_dxnfepcn(World world, Position arg2, ItemStack stack, Direction direction) {
-      TridentEntity lv = new TridentEntity(world, arg2.getX(), arg2.getY(), arg2.getZ(), stack.copyWithCount(1));
+   public ProjectileEntity createEntity(World world, Position pos, ItemStack stack, Direction direction) {
+      TridentEntity lv = new TridentEntity(world, pos.getX(), pos.getY(), pos.getZ(), stack.copyWithCount(1));
       lv.pickupType = PersistentProjectileEntity.PickupPermission.ALLOWED;
       return lv;
    }
diff -bur namedTargetSrc/net/minecraft/registry/Registries.java namedSrc/net/minecraft/registry/Registries.java
--- namedTargetSrc/net/minecraft/registry/Registries.java	2024-04-02 02:33:24.248587262 +0000
+++ namedSrc/net/minecraft/registry/Registries.java	2024-04-02 02:32:14.688105694 +0000
@@ -141,7 +141,7 @@
     * @mapping {@literal hashed f_kjlsfeby Lnet/minecraft/unmapped/C_nusqeapl;f_kjlsfeby:Lnet/minecraft/unmapped/C_zogerkic;}
     * @mapping {@literal named GAME_EVENT Lnet/minecraft/registry/Registries;GAME_EVENT:Lnet/minecraft/registry/DefaultedRegistry;}
     */
-   public static final DefaultedRegistry<GameEvent> GAME_EVENT = createDefaultMappedUnfrozenRegistry(RegistryKeys.GAME_EVENT, "step", GameEvent::m_xkscnoxj);
+   public static final DefaultedRegistry<GameEvent> GAME_EVENT = createDefaultMappedUnfrozenRegistry(RegistryKeys.GAME_EVENT, "step", GameEvent::bootstrap);
    /**
     * @mapping {@literal hashed f_qiyhrbuq Lnet/minecraft/unmapped/C_nusqeapl;f_qiyhrbuq:Lnet/minecraft/unmapped/C_tqxyjqsk;}
     * @mapping {@literal named SOUND_EVENT Lnet/minecraft/registry/Registries;SOUND_EVENT:Lnet/minecraft/registry/Registry;}
diff -bur namedTargetSrc/net/minecraft/server/integrated/IntegratedServerLoader.java namedSrc/net/minecraft/server/integrated/IntegratedServerLoader.java
--- namedTargetSrc/net/minecraft/server/integrated/IntegratedServerLoader.java	2024-04-02 02:33:24.260587339 +0000
+++ namedSrc/net/minecraft/server/integrated/IntegratedServerLoader.java	2024-04-02 02:32:14.700105784 +0000
@@ -47,7 +47,6 @@
 import net.minecraft.text.MutableText;
 import net.minecraft.text.Text;
 import net.minecraft.unmapped.C_gjgvzuad;
-import net.minecraft.unmapped.C_qhzfxdhh;
 import net.minecraft.unmapped.C_yfulyots;
 import net.minecraft.util.Formatting;
 import net.minecraft.util.Util;
@@ -63,6 +62,7 @@
 import net.minecraft.world.dimension.DimensionOptions;
 import net.minecraft.world.dimension.WorldDimensions;
 import net.minecraft.world.gen.WorldGeneratorOptions;
+import net.minecraft.world.storage.ParsedSaveProperties;
 import net.minecraft.world.storage.WorldSaveStorage;
 import net.minecraft.world.storage.WorldSaveSummary;
 import org.jetbrains.annotations.Nullable;
@@ -184,7 +184,7 @@
       WorldLoader.PackConfig lv = WorldSaveStorage.getPackConfig(dynamic, packManager, safeMode);
       return this.m_ocpkzrtb(lv, arg -> {
          Registry<DimensionOptions> lvx = arg.datapackDimensions().get(RegistryKeys.DIMENSION);
-         C_qhzfxdhh lv2 = WorldSaveStorage.m_lcpzaqzh(dynamic, arg.dataConfiguration(), lvx, arg.datapackWorldgen());
+         ParsedSaveProperties lv2 = WorldSaveStorage.m_lcpzaqzh(dynamic, arg.dataConfiguration(), lvx, arg.datapackWorldgen());
          return new WorldLoader.DataLoadOutput<>(lv2.worldData(), lv2.dimensions().toRegistryManager());
       }, WorldStem::new);
    }
@@ -210,7 +210,7 @@
          lv2,
          arg -> {
             Registry<DimensionOptions> lvx = new SimpleRegistry<>(RegistryKeys.DIMENSION, Lifecycle.stable()).freeze();
-            C_qhzfxdhh lv2x = WorldSaveStorage.m_lcpzaqzh(dynamic, arg.dataConfiguration(), lvx, arg.datapackWorldgen());
+            ParsedSaveProperties lv2x = WorldSaveStorage.m_lcpzaqzh(dynamic, arg.dataConfiguration(), lvx, arg.datapackWorldgen());
             return new WorldLoader.DataLoadOutput<>(
                new C_tattaqxb(lv2x.worldData().getWorldInfo(), lv2x.worldData().getGeneratorOptions(), lv2x.dimensions().dimensions()),
                arg.datapackDimensions()
diff -bur namedTargetSrc/net/minecraft/server/Main.java namedSrc/net/minecraft/server/Main.java
--- namedTargetSrc/net/minecraft/server/Main.java	2024-04-02 02:33:24.288587517 +0000
+++ namedSrc/net/minecraft/server/Main.java	2024-04-02 02:32:14.736106054 +0000
@@ -39,7 +39,6 @@
 import net.minecraft.server.world.FeatureAndDataSettings;
 import net.minecraft.text.Text;
 import net.minecraft.unmapped.C_gjgvzuad;
-import net.minecraft.unmapped.C_qhzfxdhh;
 import net.minecraft.util.Util;
 import net.minecraft.util.crash.CrashReport;
 import net.minecraft.util.logging.UncaughtExceptionLogger;
@@ -54,6 +53,7 @@
 import net.minecraft.world.dimension.WorldDimensions;
 import net.minecraft.world.gen.WorldGeneratorOptions;
 import net.minecraft.world.storage.ChunkStreamVersion;
+import net.minecraft.world.storage.ParsedSaveProperties;
 import net.minecraft.world.storage.WorldSaveStorage;
 import net.minecraft.world.storage.WorldSaveSummary;
 import net.minecraft.world.updater.WorldUpdater;
@@ -192,7 +192,7 @@
                         arg2x -> {
                            Registry<DimensionOptions> lvx = arg2x.datapackDimensions().get(RegistryKeys.DIMENSION);
                            if (dynamic5 != null) {
-                              C_qhzfxdhh lv2x = WorldSaveStorage.m_lcpzaqzh(dynamic5, arg2x.dataConfiguration(), lvx, arg2x.datapackWorldgen());
+                              ParsedSaveProperties lv2x = WorldSaveStorage.m_lcpzaqzh(dynamic5, arg2x.dataConfiguration(), lvx, arg2x.datapackWorldgen());
                               return new WorldLoader.DataLoadOutput<>(lv2x.worldData(), lv2x.dimensions().toRegistryManager());
                            } else {
                               LOGGER.info("No existing world data, creating new world");
@@ -317,10 +317,10 @@
       boolean eraseCache,
       BooleanSupplier shouldContinue,
       DynamicRegistryManager registryManager,
-      boolean bl2
+      boolean recreateRegionFiles
    ) {
       LOGGER.info("Forcing world upgrade!");
-      WorldUpdater lv = new WorldUpdater(session, dataFixer, registryManager, eraseCache, bl2);
+      WorldUpdater lv = new WorldUpdater(session, dataFixer, registryManager, eraseCache, recreateRegionFiles);
       Text lv2 = null;
 
       while (!lv.isDone()) {
diff -bur namedTargetSrc/net/minecraft/server/world/ServerWorld.java namedSrc/net/minecraft/server/world/ServerWorld.java
--- namedTargetSrc/net/minecraft/server/world/ServerWorld.java	2024-04-02 02:33:24.320587721 +0000
+++ namedSrc/net/minecraft/server/world/ServerWorld.java	2024-04-02 02:32:14.768106294 +0000
@@ -92,8 +92,6 @@
 import net.minecraft.structure.StructureManager;
 import net.minecraft.structure.StructureTemplateManager;
 import net.minecraft.text.Text;
-import net.minecraft.unmapped.C_gwzzviyw;
-import net.minecraft.unmapped.C_tzvgbkzf;
 import net.minecraft.util.CsvWriter;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.ProgressListener;
@@ -157,6 +155,8 @@
 import net.minecraft.world.poi.PointOfInterestTypes;
 import net.minecraft.world.storage.ChunkDataAccess;
 import net.minecraft.world.storage.EntityChunkDataAccess;
+import net.minecraft.world.storage.RegionStorageKey;
+import net.minecraft.world.storage.SimpleRegionStorage;
 import net.minecraft.world.storage.WorldSaveStorage;
 import net.minecraft.world.tick.TickManager;
 import net.minecraft.world.tick.WorldTickScheduler;
@@ -385,8 +385,8 @@
       boolean bl3 = server.syncChunkWrites();
       DataFixer dataFixer = server.getDataFixer();
       ChunkDataAccess<Entity> lv2 = new EntityChunkDataAccess(
-         new C_gwzzviyw(
-            new C_tzvgbkzf(session.getDirectoryName(), registryKey, "entities"),
+         new SimpleRegionStorage(
+            new RegionStorageKey(session.getDirectoryName(), registryKey, "entities"),
             session.getWorldDirectory(registryKey).resolve("entities"),
             dataFixer,
             bl3,
diff -bur namedTargetSrc/net/minecraft/server/world/ThreadedChunkManager.java namedSrc/net/minecraft/server/world/ThreadedChunkManager.java
--- namedTargetSrc/net/minecraft/server/world/ThreadedChunkManager.java	2024-04-02 02:33:24.348587900 +0000
+++ namedSrc/net/minecraft/server/world/ThreadedChunkManager.java	2024-04-02 02:32:14.808106593 +0000
@@ -64,10 +64,8 @@
 import net.minecraft.structure.StructureStart;
 import net.minecraft.structure.StructureTemplateManager;
 import net.minecraft.unmapped.C_byseqigh;
-import net.minecraft.unmapped.C_etstfzdn;
 import net.minecraft.unmapped.C_nclgamck;
 import net.minecraft.unmapped.C_niowvjqq;
-import net.minecraft.unmapped.C_tzvgbkzf;
 import net.minecraft.util.CsvWriter;
 import net.minecraft.util.Util;
 import net.minecraft.util.crash.CrashCallable;
@@ -91,6 +89,7 @@
 import net.minecraft.world.chunk.ChunkStatus;
 import net.minecraft.world.chunk.ChunkStatusChangeListener;
 import net.minecraft.world.chunk.ChunkTickTracker;
+import net.minecraft.world.chunk.ChunkType;
 import net.minecraft.world.chunk.ProtoChunk;
 import net.minecraft.world.chunk.UpgradeData;
 import net.minecraft.world.chunk.WorldChunk;
@@ -100,6 +99,7 @@
 import net.minecraft.world.gen.chunk.ChunkGeneratorSettings;
 import net.minecraft.world.gen.chunk.NoiseChunkGenerator;
 import net.minecraft.world.poi.PointOfInterestStorage;
+import net.minecraft.world.storage.RegionStorageKey;
 import net.minecraft.world.storage.VersionedChunkStorage;
 import net.minecraft.world.storage.WorldSaveStorage;
 import org.apache.commons.lang3.mutable.MutableBoolean;
@@ -325,7 +325,7 @@
       boolean dsync
    ) {
       super(
-         new C_tzvgbkzf(saveStorageSession.getDirectoryName(), world.getRegistryKey(), "chunk"),
+         new RegionStorageKey(saveStorageSession.getDirectoryName(), world.getRegistryKey(), "chunk"),
          saveStorageSession.getWorldDirectory(world.getRegistryKey()).resolve("region"),
          dataFixer,
          dsync
@@ -360,7 +360,7 @@
       this.ticketManager = new ThreadedChunkManager.TicketManager(executor, mainThreadExecutor);
       this.persistentStateManagerFactory = persistentStateManagerFactory;
       this.pointOfInterestStorage = new PointOfInterestStorage(
-         new C_tzvgbkzf(saveStorageSession.getDirectoryName(), world.getRegistryKey(), "poi"), path.resolve("poi"), dataFixer, dsync, lv, world
+         new RegionStorageKey(saveStorageSession.getDirectoryName(), world.getRegistryKey(), "poi"), path.resolve("poi"), dataFixer, dsync, lv, world
       );
       this.m_uvyaoong(viewDistance);
       this.f_soxmggrz = new C_nclgamck(world, chunkGenerator, structureTemplateManager, this.lightingProvider);
@@ -900,8 +900,8 @@
    /**
     * Mapping not found
     */
-   private byte m_licqfdlz(ChunkPos arg, C_etstfzdn arg2) {
-      return this.chunkToType.put(arg.toLong(), (byte)(arg2 == C_etstfzdn.PROTOCHUNK ? -1 : 1));
+   private byte m_licqfdlz(ChunkPos arg, ChunkType arg2) {
+      return this.chunkToType.put(arg.toLong(), (byte)(arg2 == ChunkType.PROTOCHUNK ? -1 : 1));
    }
 
    /**
@@ -1118,7 +1118,7 @@
 
          try {
             ChunkStatus lv2 = chunk.getStatus();
-            if (lv2.getChunkType() != C_etstfzdn.LEVELCHUNK) {
+            if (lv2.getChunkType() != ChunkType.LEVELCHUNK) {
                if (this.m_cbfkjkzy(lv)) {
                   return false;
                }
@@ -1166,7 +1166,7 @@
             return false;
          }
 
-         C_etstfzdn lv3 = ChunkSerializer.getChunkType(lv);
+         ChunkType lv3 = ChunkSerializer.getChunkType(lv);
          return this.m_licqfdlz(pos, lv3) == 1;
       }
    }
diff -bur namedTargetSrc/net/minecraft/unmapped/C_bcbkqaaq.java namedSrc/net/minecraft/unmapped/C_bcbkqaaq.java
--- namedTargetSrc/net/minecraft/unmapped/C_bcbkqaaq.java	2024-04-02 02:33:24.200586957 +0000
+++ namedSrc/net/minecraft/unmapped/C_bcbkqaaq.java	2024-04-02 02:32:14.664105515 +0000
@@ -5,6 +5,7 @@
 import net.minecraft.entity.projectile.ProjectileEntity;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
+import net.minecraft.item.ProjectileItem;
 import net.minecraft.util.math.BlockPointer;
 import net.minecraft.util.math.Direction;
 import net.minecraft.util.math.Position;
@@ -18,21 +19,21 @@
    /**
     * Mapping not found
     */
-   private final C_dokwmwgh f_lnvxbzxz;
+   private final ProjectileItem f_lnvxbzxz;
    /**
     * Mapping not found
     */
-   private final C_dokwmwgh.C_jscrvllj f_uupspuna;
+   private final ProjectileItem.DispenserConfig f_uupspuna;
 
    /**
     * Mapping not found
     */
    public C_bcbkqaaq(Item arg) {
-      if (arg instanceof C_dokwmwgh lv) {
+      if (arg instanceof ProjectileItem lv) {
          this.f_lnvxbzxz = lv;
-         this.f_uupspuna = lv.m_kzimfaao();
+         this.f_uupspuna = lv.createDispenserConfig();
       } else {
-         throw new IllegalArgumentException(arg + " not instance of " + C_dokwmwgh.class.getSimpleName());
+         throw new IllegalArgumentException(arg + " not instance of " + ProjectileItem.class.getSimpleName());
       }
    }
 
@@ -44,9 +45,11 @@
       World lv = pointer.world();
       Direction lv2 = pointer.state().get(DispenserBlock.FACING);
       Position lv3 = this.f_uupspuna.positionFunction().getDispensePosition(pointer, lv2);
-      ProjectileEntity lv4 = this.f_lnvxbzxz.m_dxnfepcn(lv, lv3, stack, lv2);
+      ProjectileEntity lv4 = this.f_lnvxbzxz.createEntity(lv, lv3, stack, lv2);
       this.f_lnvxbzxz
-         .m_mruwcksw(lv4, (double)lv2.getOffsetX(), (double)lv2.getOffsetY(), (double)lv2.getOffsetZ(), this.f_uupspuna.power(), this.f_uupspuna.uncertainty());
+         .initialiseProjectile(
+            lv4, (double)lv2.getOffsetX(), (double)lv2.getOffsetY(), (double)lv2.getOffsetZ(), this.f_uupspuna.power(), this.f_uupspuna.uncertainty()
+         );
       lv.spawnEntity(lv4);
       stack.decrement(1);
       return stack;
Only in namedTargetSrc/net/minecraft/unmapped: C_czxrapyw.java
diff -bur namedTargetSrc/net/minecraft/unmapped/C_djwyalez.java namedSrc/net/minecraft/unmapped/C_djwyalez.java
--- namedTargetSrc/net/minecraft/unmapped/C_djwyalez.java	2024-04-02 02:33:24.352587925 +0000
+++ namedSrc/net/minecraft/unmapped/C_djwyalez.java	2024-04-02 02:32:14.812106623 +0000
@@ -9,6 +9,7 @@
 import net.minecraft.client.render.item.ItemRenderer;
 import net.minecraft.client.texture.SpriteAtlasTexture;
 import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.entity.OminousItemSpawnerEntity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.math.Axis;
@@ -20,7 +21,7 @@
  * @mapping {@literal named net/minecraft/unmapped/C_djwyalez}
  */
 @Environment(EnvType.CLIENT)
-public class C_djwyalez extends EntityRenderer<C_czxrapyw> {
+public class C_djwyalez extends EntityRenderer<OminousItemSpawnerEntity> {
    /**
     * Mapping not found
     */
@@ -44,17 +45,17 @@
 
    /**
     * @mapping {@literal hashed m_icsdnlnu Lnet/minecraft/unmapped/C_djwyalez;m_icsdnlnu(Lnet/minecraft/unmapped/C_czxrapyw;)Lnet/minecraft/unmapped/C_ncpywfca;}
-    * @mapping {@literal named getTexture Lnet/minecraft/unmapped/C_djwyalez;getTexture(Lnet/minecraft/unmapped/C_czxrapyw;)Lnet/minecraft/util/Identifier;}
+    * @mapping {@literal named getTexture Lnet/minecraft/unmapped/C_djwyalez;getTexture(Lnet/minecraft/entity/OminousItemSpawnerEntity;)Lnet/minecraft/util/Identifier;}
     */
-   public Identifier getTexture(C_czxrapyw arg) {
+   public Identifier getTexture(OminousItemSpawnerEntity arg) {
       return SpriteAtlasTexture.BLOCK_ATLAS_TEXTURE;
    }
 
    /**
     * @mapping {@literal hashed m_jzdgddnf Lnet/minecraft/unmapped/C_djwyalez;m_jzdgddnf(Lnet/minecraft/unmapped/C_czxrapyw;FFLnet/minecraft/unmapped/C_cnszsxvd;Lnet/minecraft/unmapped/C_igrgeffe;I)V}
-    * @mapping {@literal named render Lnet/minecraft/unmapped/C_djwyalez;render(Lnet/minecraft/unmapped/C_czxrapyw;FFLnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;I)V}
+    * @mapping {@literal named render Lnet/minecraft/unmapped/C_djwyalez;render(Lnet/minecraft/entity/OminousItemSpawnerEntity;FFLnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;I)V}
     */
-   public void render(C_czxrapyw arg, float f, float g, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int i) {
+   public void render(OminousItemSpawnerEntity arg, float f, float g, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int i) {
       ItemStack lv = arg.m_apattskp();
       if (!lv.isEmpty()) {
          matrices.push();
Only in namedTargetSrc/net/minecraft/unmapped: C_dokwmwgh.java
Only in namedTargetSrc/net/minecraft/unmapped: C_etstfzdn.java
Only in namedTargetSrc/net/minecraft/unmapped: C_gwzzviyw.java
diff -bur namedTargetSrc/net/minecraft/unmapped/C_naokvmws.java namedSrc/net/minecraft/unmapped/C_naokvmws.java
--- namedTargetSrc/net/minecraft/unmapped/C_naokvmws.java	2024-04-02 02:33:24.004585708 +0000
+++ namedSrc/net/minecraft/unmapped/C_naokvmws.java	2024-04-02 02:32:14.432103777 +0000
@@ -6,6 +6,7 @@
 import net.minecraft.entity.projectile.ProjectileEntity;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
+import net.minecraft.item.ProjectileItem;
 import net.minecraft.sound.SoundCategory;
 import net.minecraft.sound.SoundEvents;
 import net.minecraft.stat.Stats;
@@ -22,7 +23,7 @@
  * @mapping {@literal hashed net/minecraft/unmapped/C_naokvmws}
  * @mapping {@literal named net/minecraft/unmapped/C_naokvmws}
  */
-public class C_naokvmws extends Item implements C_dokwmwgh {
+public class C_naokvmws extends Item implements ProjectileItem {
    /**
     * Mapping not found
     */
@@ -69,34 +70,33 @@
    }
 
    /**
-    * @mapping {@literal hashed m_dxnfepcn Lnet/minecraft/unmapped/C_naokvmws;m_dxnfepcn(Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_ogbhoqwb;Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_xpuuihxf;)Lnet/minecraft/unmapped/C_ltpsyvhj;}
-    * @mapping {@literal named m_dxnfepcn Lnet/minecraft/unmapped/C_naokvmws;m_dxnfepcn(Lnet/minecraft/world/World;Lnet/minecraft/util/math/Position;Lnet/minecraft/item/ItemStack;Lnet/minecraft/util/math/Direction;)Lnet/minecraft/entity/projectile/ProjectileEntity;}
+    * Mapping not found
     */
    @Override
-   public ProjectileEntity m_dxnfepcn(World world, Position arg2, ItemStack stack, Direction direction) {
+   public ProjectileEntity createEntity(World world, Position pos, ItemStack stack, Direction direction) {
       RandomGenerator lv = world.getRandom();
       double d = lv.nextTriangular((double)direction.getOffsetX(), 0.11485000000000001);
       double e = lv.nextTriangular((double)direction.getOffsetY(), 0.11485000000000001);
       double f = lv.nextTriangular((double)direction.getOffsetZ(), 0.11485000000000001);
-      return new WindChargeEntity(world, arg2.getX(), arg2.getY(), arg2.getZ(), d, e, f);
+      return new WindChargeEntity(world, pos.getX(), pos.getY(), pos.getZ(), d, e, f);
    }
 
    /**
     * Mapping not found
     */
    @Override
-   public void m_mruwcksw(ProjectileEntity arg, double d, double e, double f, float g, float h) {
+   public void initialiseProjectile(ProjectileEntity projectile, double x, double y, double z, float speed, float divergence) {
    }
 
    /**
     * Mapping not found
     */
    @Override
-   public C_dokwmwgh.C_jscrvllj m_kzimfaao() {
-      return C_dokwmwgh.C_jscrvllj.m_lfokgmwh()
-         .m_dqjwnijh((arg, direction) -> DispenserBlock.m_kmtowdxh(arg, 1.0, Vec3d.ZERO))
-         .m_nxfppizk(6.6666665F)
-         .m_estpjtyu(1.0F)
-         .m_chenqixq();
+   public ProjectileItem.DispenserConfig createDispenserConfig() {
+      return ProjectileItem.DispenserConfig.builder()
+         .positionFunction((arg, direction) -> DispenserBlock.m_kmtowdxh(arg, 1.0, Vec3d.ZERO))
+         .uncertainty(6.6666665F)
+         .power(1.0F)
+         .build();
    }
 }
Only in namedTargetSrc/net/minecraft/unmapped: C_qchnagao.java
Only in namedTargetSrc/net/minecraft/unmapped: C_qhzfxdhh.java
Only in namedTargetSrc/net/minecraft/unmapped: C_tzvgbkzf.java
Only in namedTargetSrc/net/minecraft/unmapped: C_uukidwhx.java

@github-actions
Copy link

Choose a reason for hiding this comment

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

View the diff here (2/3): 
diff -bur namedTargetSrc/net/minecraft/util/profiling/jfr/event/ChunkEvent.java namedSrc/net/minecraft/util/profiling/jfr/event/ChunkEvent.java
--- namedTargetSrc/net/minecraft/util/profiling/jfr/event/ChunkEvent.java	2024-04-02 02:33:24.168586753 +0000
+++ namedSrc/net/minecraft/util/profiling/jfr/event/ChunkEvent.java	2024-04-02 02:32:14.632105275 +0000
@@ -6,9 +6,9 @@
 import jdk.jfr.Label;
 import jdk.jfr.Name;
 import jdk.jfr.StackTrace;
-import net.minecraft.unmapped.C_tzvgbkzf;
 import net.minecraft.util.math.ChunkPos;
 import net.minecraft.world.storage.ChunkStreamVersion;
+import net.minecraft.world.storage.RegionStorageKey;
 
 /**
  * @mapping {@literal hashed net/minecraft/unmapped/C_qwbentyj}
@@ -98,9 +98,9 @@
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_qwbentyj;<init>(Lnet/minecraft/unmapped/C_tzvgbkzf;Lnet/minecraft/unmapped/C_ynrszrtu;Lnet/minecraft/unmapped/C_jrihwgqn;I)V}
-    * @mapping {@literal named <init> Lnet/minecraft/util/profiling/jfr/event/ChunkEvent;<init>(Lnet/minecraft/unmapped/C_tzvgbkzf;Lnet/minecraft/util/math/ChunkPos;Lnet/minecraft/world/storage/ChunkStreamVersion;I)V}
+    * @mapping {@literal named <init> Lnet/minecraft/util/profiling/jfr/event/ChunkEvent;<init>(Lnet/minecraft/world/storage/RegionStorageKey;Lnet/minecraft/util/math/ChunkPos;Lnet/minecraft/world/storage/ChunkStreamVersion;I)V}
     */
-   public ChunkEvent(C_tzvgbkzf arg, ChunkPos pos, ChunkStreamVersion streamVersion, int bytes) {
+   public ChunkEvent(RegionStorageKey arg, ChunkPos pos, ChunkStreamVersion streamVersion, int bytes) {
       this.regionPosX = pos.getRegionX();
       this.regionPosZ = pos.getRegionZ();
       this.localPosX = pos.getRegionRelativeX();
diff -bur namedTargetSrc/net/minecraft/util/profiling/jfr/event/ChunkRegionReadEvent.java namedSrc/net/minecraft/util/profiling/jfr/event/ChunkRegionReadEvent.java
--- namedTargetSrc/net/minecraft/util/profiling/jfr/event/ChunkRegionReadEvent.java	2024-04-02 02:33:24.300587594 +0000
+++ namedSrc/net/minecraft/util/profiling/jfr/event/ChunkRegionReadEvent.java	2024-04-02 02:32:14.748106143 +0000
@@ -4,9 +4,9 @@
 import jdk.jfr.Label;
 import jdk.jfr.Name;
 import net.minecraft.obfuscate.DontObfuscate;
-import net.minecraft.unmapped.C_tzvgbkzf;
 import net.minecraft.util.math.ChunkPos;
 import net.minecraft.world.storage.ChunkStreamVersion;
+import net.minecraft.world.storage.RegionStorageKey;
 
 /**
  * @mapping {@literal hashed net/minecraft/util/profiling/jfr/event/ChunkRegionReadEvent}
@@ -30,7 +30,7 @@
    /**
     * Mapping not found
     */
-   public ChunkRegionReadEvent(C_tzvgbkzf arg, ChunkPos arg2, ChunkStreamVersion arg3, int i) {
+   public ChunkRegionReadEvent(RegionStorageKey arg, ChunkPos arg2, ChunkStreamVersion arg3, int i) {
       super(arg, arg2, arg3, i);
    }
 }
diff -bur namedTargetSrc/net/minecraft/util/profiling/jfr/event/ChunkRegionWriteEvent.java namedSrc/net/minecraft/util/profiling/jfr/event/ChunkRegionWriteEvent.java
--- namedTargetSrc/net/minecraft/util/profiling/jfr/event/ChunkRegionWriteEvent.java	2024-04-02 02:33:24.088586242 +0000
+++ namedSrc/net/minecraft/util/profiling/jfr/event/ChunkRegionWriteEvent.java	2024-04-02 02:32:14.532104527 +0000
@@ -4,9 +4,9 @@
 import jdk.jfr.Label;
 import jdk.jfr.Name;
 import net.minecraft.obfuscate.DontObfuscate;
-import net.minecraft.unmapped.C_tzvgbkzf;
 import net.minecraft.util.math.ChunkPos;
 import net.minecraft.world.storage.ChunkStreamVersion;
+import net.minecraft.world.storage.RegionStorageKey;
 
 /**
  * @mapping {@literal hashed net/minecraft/util/profiling/jfr/event/ChunkRegionWriteEvent}
@@ -30,7 +30,7 @@
    /**
     * Mapping not found
     */
-   public ChunkRegionWriteEvent(C_tzvgbkzf arg, ChunkPos arg2, ChunkStreamVersion arg3, int i) {
+   public ChunkRegionWriteEvent(RegionStorageKey arg, ChunkPos arg2, ChunkStreamVersion arg3, int i) {
       super(arg, arg2, arg3, i);
    }
 }
diff -bur namedTargetSrc/net/minecraft/util/profiling/jfr/JfrProfiler.java namedSrc/net/minecraft/util/profiling/jfr/JfrProfiler.java
--- namedTargetSrc/net/minecraft/util/profiling/jfr/JfrProfiler.java	2024-04-02 02:33:24.332587798 +0000
+++ namedSrc/net/minecraft/util/profiling/jfr/JfrProfiler.java	2024-04-02 02:32:14.784106413 +0000
@@ -29,7 +29,6 @@
 import net.minecraft.network.NetworkState;
 import net.minecraft.network.packet.PacketType;
 import net.minecraft.registry.RegistryKey;
-import net.minecraft.unmapped.C_tzvgbkzf;
 import net.minecraft.util.FileNameUtil;
 import net.minecraft.util.Util;
 import net.minecraft.util.math.ChunkPos;
@@ -43,6 +42,7 @@
 import net.minecraft.util.profiling.jfr.event.WorldLoadFinishedEvent;
 import net.minecraft.world.World;
 import net.minecraft.world.storage.ChunkStreamVersion;
+import net.minecraft.world.storage.RegionStorageKey;
 import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
 
@@ -343,7 +343,7 @@
     * Mapping not found
     */
    @Override
-   public void onChunkRegionReadEvent(C_tzvgbkzf state, ChunkPos pos, ChunkStreamVersion streamVersion, int bytes) {
+   public void onChunkRegionReadEvent(RegionStorageKey state, ChunkPos pos, ChunkStreamVersion streamVersion, int bytes) {
       if (ChunkRegionReadEvent.TYPE.isEnabled()) {
          new ChunkRegionReadEvent(state, pos, streamVersion, bytes).commit();
       }
@@ -353,7 +353,7 @@
     * Mapping not found
     */
    @Override
-   public void onChunkRegionWriteEvent(C_tzvgbkzf state, ChunkPos pos, ChunkStreamVersion streamVersion, int bytes) {
+   public void onChunkRegionWriteEvent(RegionStorageKey state, ChunkPos pos, ChunkStreamVersion streamVersion, int bytes) {
       if (ChunkRegionWriteEvent.TYPE.isEnabled()) {
          new ChunkRegionWriteEvent(state, pos, streamVersion, bytes).commit();
       }
diff -bur namedTargetSrc/net/minecraft/util/profiling/jfr/JvmProfiler.java namedSrc/net/minecraft/util/profiling/jfr/JvmProfiler.java
--- namedTargetSrc/net/minecraft/util/profiling/jfr/JvmProfiler.java	2024-04-02 02:33:24.064586090 +0000
+++ namedSrc/net/minecraft/util/profiling/jfr/JvmProfiler.java	2024-04-02 02:32:14.508104346 +0000
@@ -6,10 +6,10 @@
 import net.minecraft.network.NetworkState;
 import net.minecraft.network.packet.PacketType;
 import net.minecraft.registry.RegistryKey;
-import net.minecraft.unmapped.C_tzvgbkzf;
 import net.minecraft.util.math.ChunkPos;
 import net.minecraft.world.World;
 import net.minecraft.world.storage.ChunkStreamVersion;
+import net.minecraft.world.storage.RegionStorageKey;
 import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
 
@@ -70,15 +70,15 @@
 
    /**
     * @mapping {@literal hashed m_pbhqswku Lnet/minecraft/unmapped/C_pdegcfzu;m_pbhqswku(Lnet/minecraft/unmapped/C_tzvgbkzf;Lnet/minecraft/unmapped/C_ynrszrtu;Lnet/minecraft/unmapped/C_jrihwgqn;I)V}
-    * @mapping {@literal named onChunkRegionReadEvent Lnet/minecraft/util/profiling/jfr/JvmProfiler;onChunkRegionReadEvent(Lnet/minecraft/unmapped/C_tzvgbkzf;Lnet/minecraft/util/math/ChunkPos;Lnet/minecraft/world/storage/ChunkStreamVersion;I)V}
+    * @mapping {@literal named onChunkRegionReadEvent Lnet/minecraft/util/profiling/jfr/JvmProfiler;onChunkRegionReadEvent(Lnet/minecraft/world/storage/RegionStorageKey;Lnet/minecraft/util/math/ChunkPos;Lnet/minecraft/world/storage/ChunkStreamVersion;I)V}
     */
-   void onChunkRegionReadEvent(C_tzvgbkzf state, ChunkPos pos, ChunkStreamVersion streamVersion, int bytes);
+   void onChunkRegionReadEvent(RegionStorageKey state, ChunkPos pos, ChunkStreamVersion streamVersion, int bytes);
 
    /**
     * @mapping {@literal hashed m_sxxjwxnm Lnet/minecraft/unmapped/C_pdegcfzu;m_sxxjwxnm(Lnet/minecraft/unmapped/C_tzvgbkzf;Lnet/minecraft/unmapped/C_ynrszrtu;Lnet/minecraft/unmapped/C_jrihwgqn;I)V}
-    * @mapping {@literal named onChunkRegionWriteEvent Lnet/minecraft/util/profiling/jfr/JvmProfiler;onChunkRegionWriteEvent(Lnet/minecraft/unmapped/C_tzvgbkzf;Lnet/minecraft/util/math/ChunkPos;Lnet/minecraft/world/storage/ChunkStreamVersion;I)V}
+    * @mapping {@literal named onChunkRegionWriteEvent Lnet/minecraft/util/profiling/jfr/JvmProfiler;onChunkRegionWriteEvent(Lnet/minecraft/world/storage/RegionStorageKey;Lnet/minecraft/util/math/ChunkPos;Lnet/minecraft/world/storage/ChunkStreamVersion;I)V}
     */
-   void onChunkRegionWriteEvent(C_tzvgbkzf state, ChunkPos pos, ChunkStreamVersion streamVersion, int bytes);
+   void onChunkRegionWriteEvent(RegionStorageKey state, ChunkPos pos, ChunkStreamVersion streamVersion, int bytes);
 
    /**
     * @mapping {@literal hashed m_obrtcwbv Lnet/minecraft/unmapped/C_pdegcfzu;m_obrtcwbv()Lnet/minecraft/unmapped/C_ubafnjcv;}
@@ -162,14 +162,14 @@
        * Mapping not found
        */
       @Override
-      public void onChunkRegionReadEvent(C_tzvgbkzf state, ChunkPos pos, ChunkStreamVersion streamVersion, int bytes) {
+      public void onChunkRegionReadEvent(RegionStorageKey state, ChunkPos pos, ChunkStreamVersion streamVersion, int bytes) {
       }
 
       /**
        * Mapping not found
        */
       @Override
-      public void onChunkRegionWriteEvent(C_tzvgbkzf state, ChunkPos pos, ChunkStreamVersion streamVersion, int bytes) {
+      public void onChunkRegionWriteEvent(RegionStorageKey state, ChunkPos pos, ChunkStreamVersion streamVersion, int bytes) {
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/world/biome/util/MultiNoiseBiomeSourceParameterList.java namedSrc/net/minecraft/world/biome/util/MultiNoiseBiomeSourceParameterList.java
--- namedTargetSrc/net/minecraft/world/biome/util/MultiNoiseBiomeSourceParameterList.java	2024-04-02 02:33:24.096586294 +0000
+++ namedSrc/net/minecraft/world/biome/util/MultiNoiseBiomeSourceParameterList.java	2024-04-02 02:32:14.544104616 +0000
@@ -75,9 +75,10 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_dhdwhiqm Lnet/minecraft/unmapped/C_xmtsvelx;m_dhdwhiqm()Ljava/util/Map;}
+    * @mapping {@literal named getKnownPresets Lnet/minecraft/world/biome/util/MultiNoiseBiomeSourceParameterList;getKnownPresets()Ljava/util/Map;}
     */
-   public static Map<MultiNoiseBiomeSourceParameterList.Preset, MultiNoiseUtil.ParameterRangeList<RegistryKey<Biome>>> m_dhdwhiqm() {
+   public static Map<MultiNoiseBiomeSourceParameterList.Preset, MultiNoiseUtil.ParameterRangeList<RegistryKey<Biome>>> getKnownPresets() {
       return (Map<MultiNoiseBiomeSourceParameterList.Preset, MultiNoiseUtil.ParameterRangeList<RegistryKey<Biome>>>)MultiNoiseBiomeSourceParameterList.Preset.f_ppnmbhdr
          .values()
          .stream()
@@ -170,7 +171,8 @@
       @FunctionalInterface
       interface SourceProvider {
          /**
-          * Mapping not found
+          * @mapping {@literal hashed apply Lnet/minecraft/unmapped/C_xmtsvelx$C_jgklgqjr$C_pttrytil;apply(Ljava/util/function/Function;)Lnet/minecraft/unmapped/C_ohqwadgy$C_ftigwvun;}
+          * @mapping {@literal named apply Lnet/minecraft/world/biome/util/MultiNoiseBiomeSourceParameterList$Preset$SourceProvider;apply(Ljava/util/function/Function;)Lnet/minecraft/world/biome/source/util/MultiNoiseUtil$ParameterRangeList;}
           */
          <T> MultiNoiseUtil.ParameterRangeList<T> apply(Function<RegistryKey<Biome>, T> function);
       }
diff -bur namedTargetSrc/net/minecraft/world/chunk/ChunkStatus.java namedSrc/net/minecraft/world/chunk/ChunkStatus.java
--- namedTargetSrc/net/minecraft/world/chunk/ChunkStatus.java	2024-04-02 02:33:24.148586625 +0000
+++ namedSrc/net/minecraft/world/chunk/ChunkStatus.java	2024-04-02 02:32:14.612105125 +0000
@@ -11,7 +11,6 @@
 import java.util.concurrent.Executor;
 import net.minecraft.registry.Registries;
 import net.minecraft.registry.Registry;
-import net.minecraft.unmapped.C_etstfzdn;
 import net.minecraft.unmapped.C_gmiipzer;
 import net.minecraft.unmapped.C_nclgamck;
 import net.minecraft.unmapped.C_zltcyjrk;
@@ -49,84 +48,84 @@
     * @mapping {@literal named EMPTY Lnet/minecraft/world/chunk/ChunkStatus;EMPTY:Lnet/minecraft/world/chunk/ChunkStatus;}
     */
    public static final ChunkStatus EMPTY = m_qqgkhfzu(
-      "empty", null, -1, false, PRE_CARVER_HEIGHTMAPS, C_etstfzdn.PROTOCHUNK, C_zltcyjrk::m_tegywela, C_zltcyjrk::m_hdrpgtlz
+      "empty", null, -1, false, PRE_CARVER_HEIGHTMAPS, ChunkType.PROTOCHUNK, C_zltcyjrk::m_tegywela, C_zltcyjrk::m_hdrpgtlz
    );
    /**
     * @mapping {@literal hashed f_wltsmhzo Lnet/minecraft/unmapped/C_kogtzhzt;f_wltsmhzo:Lnet/minecraft/unmapped/C_kogtzhzt;}
     * @mapping {@literal named STRUCTURE_STARTS Lnet/minecraft/world/chunk/ChunkStatus;STRUCTURE_STARTS:Lnet/minecraft/world/chunk/ChunkStatus;}
     */
    public static final ChunkStatus STRUCTURE_STARTS = m_qqgkhfzu(
-      "structure_starts", EMPTY, 0, false, PRE_CARVER_HEIGHTMAPS, C_etstfzdn.PROTOCHUNK, C_zltcyjrk::m_mlavjceg, C_zltcyjrk::m_osozltfn
+      "structure_starts", EMPTY, 0, false, PRE_CARVER_HEIGHTMAPS, ChunkType.PROTOCHUNK, C_zltcyjrk::m_mlavjceg, C_zltcyjrk::m_osozltfn
    );
    /**
     * @mapping {@literal hashed f_qqtsblgw Lnet/minecraft/unmapped/C_kogtzhzt;f_qqtsblgw:Lnet/minecraft/unmapped/C_kogtzhzt;}
     * @mapping {@literal named STRUCTURE_REFERENCES Lnet/minecraft/world/chunk/ChunkStatus;STRUCTURE_REFERENCES:Lnet/minecraft/world/chunk/ChunkStatus;}
     */
    public static final ChunkStatus STRUCTURE_REFERENCES = m_qqgkhfzu(
-      "structure_references", STRUCTURE_STARTS, 8, false, PRE_CARVER_HEIGHTMAPS, C_etstfzdn.PROTOCHUNK, C_zltcyjrk::m_zxdzuzzm, C_zltcyjrk::m_hdrpgtlz
+      "structure_references", STRUCTURE_STARTS, 8, false, PRE_CARVER_HEIGHTMAPS, ChunkType.PROTOCHUNK, C_zltcyjrk::m_zxdzuzzm, C_zltcyjrk::m_hdrpgtlz
    );
    /**
     * @mapping {@literal hashed f_sjllwnsi Lnet/minecraft/unmapped/C_kogtzhzt;f_sjllwnsi:Lnet/minecraft/unmapped/C_kogtzhzt;}
     * @mapping {@literal named BIOMES Lnet/minecraft/world/chunk/ChunkStatus;BIOMES:Lnet/minecraft/world/chunk/ChunkStatus;}
     */
    public static final ChunkStatus BIOMES = m_qqgkhfzu(
-      "biomes", STRUCTURE_REFERENCES, 8, false, PRE_CARVER_HEIGHTMAPS, C_etstfzdn.PROTOCHUNK, C_zltcyjrk::m_xefklkzf, C_zltcyjrk::m_hdrpgtlz
+      "biomes", STRUCTURE_REFERENCES, 8, false, PRE_CARVER_HEIGHTMAPS, ChunkType.PROTOCHUNK, C_zltcyjrk::m_xefklkzf, C_zltcyjrk::m_hdrpgtlz
    );
    /**
     * @mapping {@literal hashed f_aoiotdlb Lnet/minecraft/unmapped/C_kogtzhzt;f_aoiotdlb:Lnet/minecraft/unmapped/C_kogtzhzt;}
     * @mapping {@literal named NOISE Lnet/minecraft/world/chunk/ChunkStatus;NOISE:Lnet/minecraft/world/chunk/ChunkStatus;}
     */
    public static final ChunkStatus NOISE = m_qqgkhfzu(
-      "noise", BIOMES, 8, false, PRE_CARVER_HEIGHTMAPS, C_etstfzdn.PROTOCHUNK, C_zltcyjrk::m_shktblhf, C_zltcyjrk::m_hdrpgtlz
+      "noise", BIOMES, 8, false, PRE_CARVER_HEIGHTMAPS, ChunkType.PROTOCHUNK, C_zltcyjrk::m_shktblhf, C_zltcyjrk::m_hdrpgtlz
    );
    /**
     * @mapping {@literal hashed f_pmmxjybz Lnet/minecraft/unmapped/C_kogtzhzt;f_pmmxjybz:Lnet/minecraft/unmapped/C_kogtzhzt;}
     * @mapping {@literal named SURFACE Lnet/minecraft/world/chunk/ChunkStatus;SURFACE:Lnet/minecraft/world/chunk/ChunkStatus;}
     */
    public static final ChunkStatus SURFACE = m_qqgkhfzu(
-      "surface", NOISE, 8, false, PRE_CARVER_HEIGHTMAPS, C_etstfzdn.PROTOCHUNK, C_zltcyjrk::m_gxzibvau, C_zltcyjrk::m_hdrpgtlz
+      "surface", NOISE, 8, false, PRE_CARVER_HEIGHTMAPS, ChunkType.PROTOCHUNK, C_zltcyjrk::m_gxzibvau, C_zltcyjrk::m_hdrpgtlz
    );
    /**
     * @mapping {@literal hashed f_llwgenkr Lnet/minecraft/unmapped/C_kogtzhzt;f_llwgenkr:Lnet/minecraft/unmapped/C_kogtzhzt;}
     * @mapping {@literal named CARVERS Lnet/minecraft/world/chunk/ChunkStatus;CARVERS:Lnet/minecraft/world/chunk/ChunkStatus;}
     */
    public static final ChunkStatus CARVERS = m_qqgkhfzu(
-      "carvers", SURFACE, 8, false, POST_CARVER_HEIGHTMAPS, C_etstfzdn.PROTOCHUNK, C_zltcyjrk::m_ppuqvbdm, C_zltcyjrk::m_hdrpgtlz
+      "carvers", SURFACE, 8, false, POST_CARVER_HEIGHTMAPS, ChunkType.PROTOCHUNK, C_zltcyjrk::m_ppuqvbdm, C_zltcyjrk::m_hdrpgtlz
    );
    /**
     * @mapping {@literal hashed f_ulxsulqs Lnet/minecraft/unmapped/C_kogtzhzt;f_ulxsulqs:Lnet/minecraft/unmapped/C_kogtzhzt;}
     * @mapping {@literal named FEATURES Lnet/minecraft/world/chunk/ChunkStatus;FEATURES:Lnet/minecraft/world/chunk/ChunkStatus;}
     */
    public static final ChunkStatus FEATURES = m_qqgkhfzu(
-      "features", CARVERS, 8, false, POST_CARVER_HEIGHTMAPS, C_etstfzdn.PROTOCHUNK, C_zltcyjrk::m_abewvjbd, C_zltcyjrk::m_hdrpgtlz
+      "features", CARVERS, 8, false, POST_CARVER_HEIGHTMAPS, ChunkType.PROTOCHUNK, C_zltcyjrk::m_abewvjbd, C_zltcyjrk::m_hdrpgtlz
    );
    /**
     * @mapping {@literal hashed f_ycwdnyyi Lnet/minecraft/unmapped/C_kogtzhzt;f_ycwdnyyi:Lnet/minecraft/unmapped/C_kogtzhzt;}
     * @mapping {@literal named INITIALIZE_LIGHT Lnet/minecraft/world/chunk/ChunkStatus;INITIALIZE_LIGHT:Lnet/minecraft/world/chunk/ChunkStatus;}
     */
    public static final ChunkStatus INITIALIZE_LIGHT = m_qqgkhfzu(
-      "initialize_light", FEATURES, 0, false, POST_CARVER_HEIGHTMAPS, C_etstfzdn.PROTOCHUNK, C_zltcyjrk::m_xfpjhujq, C_zltcyjrk::m_gfbjsxgt
+      "initialize_light", FEATURES, 0, false, POST_CARVER_HEIGHTMAPS, ChunkType.PROTOCHUNK, C_zltcyjrk::m_xfpjhujq, C_zltcyjrk::m_gfbjsxgt
    );
    /**
     * @mapping {@literal hashed f_aaleuwae Lnet/minecraft/unmapped/C_kogtzhzt;f_aaleuwae:Lnet/minecraft/unmapped/C_kogtzhzt;}
     * @mapping {@literal named LIGHT Lnet/minecraft/world/chunk/ChunkStatus;LIGHT:Lnet/minecraft/world/chunk/ChunkStatus;}
     */
    public static final ChunkStatus LIGHT = m_qqgkhfzu(
-      "light", INITIALIZE_LIGHT, 1, true, POST_CARVER_HEIGHTMAPS, C_etstfzdn.PROTOCHUNK, C_zltcyjrk::m_nkqhiavd, C_zltcyjrk::m_bwxiyagu
+      "light", INITIALIZE_LIGHT, 1, true, POST_CARVER_HEIGHTMAPS, ChunkType.PROTOCHUNK, C_zltcyjrk::m_nkqhiavd, C_zltcyjrk::m_bwxiyagu
    );
    /**
     * @mapping {@literal hashed f_ysliwunm Lnet/minecraft/unmapped/C_kogtzhzt;f_ysliwunm:Lnet/minecraft/unmapped/C_kogtzhzt;}
     * @mapping {@literal named SPAWN Lnet/minecraft/world/chunk/ChunkStatus;SPAWN:Lnet/minecraft/world/chunk/ChunkStatus;}
     */
    public static final ChunkStatus SPAWN = m_qqgkhfzu(
-      "spawn", LIGHT, 1, false, POST_CARVER_HEIGHTMAPS, C_etstfzdn.PROTOCHUNK, C_zltcyjrk::m_uqiuooir, C_zltcyjrk::m_hdrpgtlz
+      "spawn", LIGHT, 1, false, POST_CARVER_HEIGHTMAPS, ChunkType.PROTOCHUNK, C_zltcyjrk::m_uqiuooir, C_zltcyjrk::m_hdrpgtlz
    );
    /**
     * @mapping {@literal hashed f_ixrpkmsf Lnet/minecraft/unmapped/C_kogtzhzt;f_ixrpkmsf:Lnet/minecraft/unmapped/C_kogtzhzt;}
     * @mapping {@literal named FULL Lnet/minecraft/world/chunk/ChunkStatus;FULL:Lnet/minecraft/world/chunk/ChunkStatus;}
     */
    public static final ChunkStatus FULL = m_qqgkhfzu(
-      "full", SPAWN, 0, false, POST_CARVER_HEIGHTMAPS, C_etstfzdn.LEVELCHUNK, C_zltcyjrk::m_qvmoydaa, C_zltcyjrk::m_mcbnotgi
+      "full", SPAWN, 0, false, POST_CARVER_HEIGHTMAPS, ChunkType.LEVELCHUNK, C_zltcyjrk::m_qvmoydaa, C_zltcyjrk::m_mcbnotgi
    );
    /**
     * @mapping {@literal hashed f_oahrucge Lnet/minecraft/unmapped/C_kogtzhzt;f_oahrucge:Ljava/util/List;}
@@ -193,9 +192,9 @@
    private final boolean hasLoadDependencies;
    /**
     * @mapping {@literal hashed f_jubsnmxj Lnet/minecraft/unmapped/C_kogtzhzt;f_jubsnmxj:Lnet/minecraft/unmapped/C_etstfzdn;}
-    * @mapping {@literal named chunkType Lnet/minecraft/world/chunk/ChunkStatus;chunkType:Lnet/minecraft/unmapped/C_etstfzdn;}
+    * @mapping {@literal named chunkType Lnet/minecraft/world/chunk/ChunkStatus;chunkType:Lnet/minecraft/world/chunk/ChunkType;}
     */
-   private final C_etstfzdn chunkType;
+   private final ChunkType chunkType;
    /**
     * @mapping {@literal hashed f_pojlaofj Lnet/minecraft/unmapped/C_kogtzhzt;f_pojlaofj:Ljava/util/EnumSet;}
     * @mapping {@literal named heightMapTypes Lnet/minecraft/world/chunk/ChunkStatus;heightMapTypes:Ljava/util/EnumSet;}
@@ -204,7 +203,7 @@
 
    /**
     * @mapping {@literal hashed m_qqgkhfzu Lnet/minecraft/unmapped/C_kogtzhzt;m_qqgkhfzu(Ljava/lang/String;Lnet/minecraft/unmapped/C_kogtzhzt;IZLjava/util/EnumSet;Lnet/minecraft/unmapped/C_etstfzdn;Lnet/minecraft/unmapped/C_kogtzhzt$C_wratqrbq;Lnet/minecraft/unmapped/C_kogtzhzt$C_sldnkxjm;)Lnet/minecraft/unmapped/C_kogtzhzt;}
-    * @mapping {@literal named m_qqgkhfzu Lnet/minecraft/world/chunk/ChunkStatus;m_qqgkhfzu(Ljava/lang/String;Lnet/minecraft/world/chunk/ChunkStatus;IZLjava/util/EnumSet;Lnet/minecraft/unmapped/C_etstfzdn;Lnet/minecraft/world/chunk/ChunkStatus$GenerationTask;Lnet/minecraft/world/chunk/ChunkStatus$LoadTask;)Lnet/minecraft/world/chunk/ChunkStatus;}
+    * @mapping {@literal named m_qqgkhfzu Lnet/minecraft/world/chunk/ChunkStatus;m_qqgkhfzu(Ljava/lang/String;Lnet/minecraft/world/chunk/ChunkStatus;IZLjava/util/EnumSet;Lnet/minecraft/world/chunk/ChunkType;Lnet/minecraft/world/chunk/ChunkStatus$GenerationTask;Lnet/minecraft/world/chunk/ChunkStatus$LoadTask;)Lnet/minecraft/world/chunk/ChunkStatus;}
     */
    private static ChunkStatus m_qqgkhfzu(
       String id,
@@ -212,7 +211,7 @@
       int taskMargin,
       boolean hasLoadDependencies,
       EnumSet<Heightmap.Type> heightMapTypes,
-      C_etstfzdn chunkType,
+      ChunkType chunkType,
       ChunkStatus.GenerationTask generationTask,
       ChunkStatus.LoadTask loadTask
    ) {
@@ -268,14 +267,14 @@
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_kogtzhzt;<init>(Lnet/minecraft/unmapped/C_kogtzhzt;IZLjava/util/EnumSet;Lnet/minecraft/unmapped/C_etstfzdn;Lnet/minecraft/unmapped/C_kogtzhzt$C_wratqrbq;Lnet/minecraft/unmapped/C_kogtzhzt$C_sldnkxjm;)V}
-    * @mapping {@literal named <init> Lnet/minecraft/world/chunk/ChunkStatus;<init>(Lnet/minecraft/world/chunk/ChunkStatus;IZLjava/util/EnumSet;Lnet/minecraft/unmapped/C_etstfzdn;Lnet/minecraft/world/chunk/ChunkStatus$GenerationTask;Lnet/minecraft/world/chunk/ChunkStatus$LoadTask;)V}
+    * @mapping {@literal named <init> Lnet/minecraft/world/chunk/ChunkStatus;<init>(Lnet/minecraft/world/chunk/ChunkStatus;IZLjava/util/EnumSet;Lnet/minecraft/world/chunk/ChunkType;Lnet/minecraft/world/chunk/ChunkStatus$GenerationTask;Lnet/minecraft/world/chunk/ChunkStatus$LoadTask;)V}
     */
    ChunkStatus(
       @Nullable ChunkStatus arg,
       int taskMargin,
       boolean hasLoadDependencies,
       EnumSet<Heightmap.Type> heightMapTypes,
-      C_etstfzdn chunkType,
+      ChunkType chunkType,
       ChunkStatus.GenerationTask generationTask,
       ChunkStatus.LoadTask loadTask
    ) {
@@ -351,9 +350,9 @@
 
    /**
     * @mapping {@literal hashed m_ghbhrtxe Lnet/minecraft/unmapped/C_kogtzhzt;m_ghbhrtxe()Lnet/minecraft/unmapped/C_etstfzdn;}
-    * @mapping {@literal named getChunkType Lnet/minecraft/world/chunk/ChunkStatus;getChunkType()Lnet/minecraft/unmapped/C_etstfzdn;}
+    * @mapping {@literal named getChunkType Lnet/minecraft/world/chunk/ChunkStatus;getChunkType()Lnet/minecraft/world/chunk/ChunkType;}
     */
-   public C_etstfzdn getChunkType() {
+   public ChunkType getChunkType() {
       return this.chunkType;
    }
 
Only in namedSrc/net/minecraft/world/chunk: ChunkType.java
diff -bur namedTargetSrc/net/minecraft/world/ChunkRegion.java namedSrc/net/minecraft/world/ChunkRegion.java
--- namedTargetSrc/net/minecraft/world/ChunkRegion.java	2024-04-02 02:33:24.352587925 +0000
+++ namedSrc/net/minecraft/world/ChunkRegion.java	2024-04-02 02:32:14.808106593 +0000
@@ -27,7 +27,6 @@
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.sound.SoundCategory;
 import net.minecraft.sound.SoundEvent;
-import net.minecraft.unmapped.C_etstfzdn;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.TypeFilter;
 import net.minecraft.util.Util;
@@ -49,6 +48,7 @@
 import net.minecraft.world.chunk.Chunk;
 import net.minecraft.world.chunk.ChunkManager;
 import net.minecraft.world.chunk.ChunkStatus;
+import net.minecraft.world.chunk.ChunkType;
 import net.minecraft.world.chunk.light.LightingProvider;
 import net.minecraft.world.dimension.DimensionType;
 import net.minecraft.world.event.GameEvent;
@@ -436,7 +436,7 @@
          }
 
          if (state.hasBlockEntity()) {
-            if (lv.getStatus().getChunkType() == C_etstfzdn.LEVELCHUNK) {
+            if (lv.getStatus().getChunkType() == ChunkType.LEVELCHUNK) {
                BlockEntity lv3 = ((BlockEntityProvider)state.getBlock()).createBlockEntity(pos, state);
                if (lv3 != null) {
                   lv.setBlockEntity(lv3);
diff -bur namedTargetSrc/net/minecraft/world/ChunkSerializer.java namedSrc/net/minecraft/world/ChunkSerializer.java
--- namedTargetSrc/net/minecraft/world/ChunkSerializer.java	2024-04-02 02:33:24.188586880 +0000
+++ namedSrc/net/minecraft/world/ChunkSerializer.java	2024-04-02 02:32:14.656105455 +0000
@@ -33,7 +33,6 @@
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.structure.StructureStart;
 import net.minecraft.structure.piece.StructurePieceSerializationContext;
-import net.minecraft.unmapped.C_etstfzdn;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.ChunkPos;
@@ -45,6 +44,7 @@
 import net.minecraft.world.chunk.ChunkNibbleArray;
 import net.minecraft.world.chunk.ChunkSection;
 import net.minecraft.world.chunk.ChunkStatus;
+import net.minecraft.world.chunk.ChunkType;
 import net.minecraft.world.chunk.ProtoChunk;
 import net.minecraft.world.chunk.ReadableContainer;
 import net.minecraft.world.chunk.UpgradeData;
@@ -203,7 +203,7 @@
       }
 
       long m = nbt.getLong("InhabitedTime");
-      C_etstfzdn lv14 = getChunkType(nbt);
+      ChunkType lv14 = getChunkType(nbt);
       BlendingData lv15;
       if (nbt.contains("blending_data", NbtElement.COMPOUND_TYPE)) {
          lv15 = (BlendingData)BlendingData.CODEC
@@ -215,7 +215,7 @@
       }
 
       Chunk lv19;
-      if (lv14 == C_etstfzdn.LEVELCHUNK) {
+      if (lv14 == ChunkType.LEVELCHUNK) {
          ChunkTickScheduler<Block> lv17 = ChunkTickScheduler.create(
             nbt.getList("block_ticks", NbtElement.COMPOUND_TYPE), blockId -> Registries.BLOCK.getOrEmpty(Identifier.tryParse(blockId)), pos
          );
@@ -278,7 +278,7 @@
          }
       }
 
-      if (lv14 == C_etstfzdn.LEVELCHUNK) {
+      if (lv14 == ChunkType.LEVELCHUNK) {
          return new WrapperProtoChunk((WorldChunk)lv19, false);
       } else {
          ProtoChunk lv30 = (ProtoChunk)lv19;
@@ -402,7 +402,7 @@
       }
 
       lv2.put("block_entities", lv13);
-      if (chunk.getStatus().getChunkType() == C_etstfzdn.PROTOCHUNK) {
+      if (chunk.getStatus().getChunkType() == ChunkType.PROTOCHUNK) {
          ProtoChunk lv16 = (ProtoChunk)chunk;
          NbtList lv17 = new NbtList();
          lv17.addAll(lv16.getEntities());
@@ -449,10 +449,10 @@
 
    /**
     * @mapping {@literal hashed m_gcmtnulo Lnet/minecraft/unmapped/C_bsqbntcq;m_gcmtnulo(Lnet/minecraft/unmapped/C_hhlwcnih;)Lnet/minecraft/unmapped/C_etstfzdn;}
-    * @mapping {@literal named getChunkType Lnet/minecraft/world/ChunkSerializer;getChunkType(Lnet/minecraft/nbt/NbtCompound;)Lnet/minecraft/unmapped/C_etstfzdn;}
+    * @mapping {@literal named getChunkType Lnet/minecraft/world/ChunkSerializer;getChunkType(Lnet/minecraft/nbt/NbtCompound;)Lnet/minecraft/world/chunk/ChunkType;}
     */
-   public static C_etstfzdn getChunkType(@Nullable NbtCompound nbt) {
-      return nbt != null ? ChunkStatus.byId(nbt.getString("Status")).getChunkType() : C_etstfzdn.PROTOCHUNK;
+   public static ChunkType getChunkType(@Nullable NbtCompound nbt) {
+      return nbt != null ? ChunkStatus.byId(nbt.getString("Status")).getChunkType() : ChunkType.PROTOCHUNK;
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/world/event/BlockPositionSource.java namedSrc/net/minecraft/world/event/BlockPositionSource.java
--- namedTargetSrc/net/minecraft/world/event/BlockPositionSource.java	2024-04-02 02:33:24.120586447 +0000
+++ namedSrc/net/minecraft/world/event/BlockPositionSource.java	2024-04-02 02:32:14.572104826 +0000
@@ -75,7 +75,7 @@
        * Mapping not found
        */
       @Override
-      public PacketCodec<RegistryByteBuf, BlockPositionSource> m_biyeqjqa() {
+      public PacketCodec<RegistryByteBuf, BlockPositionSource> getPacketCodec() {
          return BlockPositionSource.PACKET_CODEC;
       }
    }
diff -bur namedTargetSrc/net/minecraft/world/event/EntityPositionSource.java namedSrc/net/minecraft/world/event/EntityPositionSource.java
--- namedTargetSrc/net/minecraft/world/event/EntityPositionSource.java	2024-04-02 02:33:24.288587517 +0000
+++ namedSrc/net/minecraft/world/event/EntityPositionSource.java	2024-04-02 02:32:14.736106054 +0000
@@ -141,7 +141,7 @@
        * Mapping not found
        */
       @Override
-      public PacketCodec<RegistryByteBuf, EntityPositionSource> m_biyeqjqa() {
+      public PacketCodec<RegistryByteBuf, EntityPositionSource> getPacketCodec() {
          return EntityPositionSource.PACKET_CODEC;
       }
    }
diff -bur namedTargetSrc/net/minecraft/world/event/GameEvent.java namedSrc/net/minecraft/world/event/GameEvent.java
--- namedTargetSrc/net/minecraft/world/event/GameEvent.java	2024-04-02 02:33:24.308587644 +0000
+++ namedSrc/net/minecraft/world/event/GameEvent.java	2024-04-02 02:32:14.756106203 +0000
@@ -323,9 +323,9 @@
 
    /**
     * @mapping {@literal hashed m_xkscnoxj Lnet/minecraft/unmapped/C_cgkchrmc;m_xkscnoxj(Lnet/minecraft/unmapped/C_tqxyjqsk;)Lnet/minecraft/unmapped/C_cjzoxshv;}
-    * @mapping {@literal named m_xkscnoxj Lnet/minecraft/world/event/GameEvent;m_xkscnoxj(Lnet/minecraft/registry/Registry;)Lnet/minecraft/registry/Holder;}
+    * @mapping {@literal named bootstrap Lnet/minecraft/world/event/GameEvent;bootstrap(Lnet/minecraft/registry/Registry;)Lnet/minecraft/registry/Holder;}
     */
-   public static Holder<GameEvent> m_xkscnoxj(Registry<GameEvent> registry) {
+   public static Holder<GameEvent> bootstrap(Registry<GameEvent> registry) {
       return BLOCK_ACTIVATE;
    }
 
diff -bur namedTargetSrc/net/minecraft/world/event/listener/GameEventListener.java namedSrc/net/minecraft/world/event/listener/GameEventListener.java
--- namedTargetSrc/net/minecraft/world/event/listener/GameEventListener.java	2024-04-02 02:33:24.060586064 +0000
+++ namedSrc/net/minecraft/world/event/listener/GameEventListener.java	2024-04-02 02:32:14.504104317 +0000
@@ -48,17 +48,6 @@
    }
 
    /**
-    * @mapping {@literal hashed net/minecraft/unmapped/C_sbgxqpya$C_ohqzxsuw}
-    * @mapping {@literal named net/minecraft/world/event/listener/GameEventListener$C_ohqzxsuw}
-    */
-   public interface C_ohqzxsuw<T extends GameEventListener> {
-      /**
-       * Mapping not found
-       */
-      T m_duureayn();
-   }
-
-   /**
     * @mapping {@literal hashed net/minecraft/unmapped/C_sbgxqpya$C_exhjgbpz}
     * @mapping {@literal named net/minecraft/world/event/listener/GameEventListener$DeliveryMode}
     */
@@ -74,4 +63,16 @@
        */
       BY_DISTANCE;
    }
+
+   /**
+    * @mapping {@literal hashed net/minecraft/unmapped/C_sbgxqpya$C_ohqzxsuw}
+    * @mapping {@literal named net/minecraft/world/event/listener/GameEventListener$Provider}
+    */
+   public interface Provider<T extends GameEventListener> {
+      /**
+       * @mapping {@literal hashed m_duureayn Lnet/minecraft/unmapped/C_sbgxqpya$C_ohqzxsuw;m_duureayn()Lnet/minecraft/unmapped/C_sbgxqpya;}
+       * @mapping {@literal named getListener Lnet/minecraft/world/event/listener/GameEventListener$Provider;getListener()Lnet/minecraft/world/event/listener/GameEventListener;}
+       */
+      T getListener();
+   }
 }
diff -bur namedTargetSrc/net/minecraft/world/event/PositionSource.java namedSrc/net/minecraft/world/event/PositionSource.java
--- namedTargetSrc/net/minecraft/world/event/PositionSource.java	2024-04-02 02:33:24.104586345 +0000
+++ namedSrc/net/minecraft/world/event/PositionSource.java	2024-04-02 02:32:14.556104706 +0000
@@ -32,7 +32,7 @@
     * @mapping {@literal named PACKET_CODEC Lnet/minecraft/world/event/PositionSource;PACKET_CODEC:Lnet/minecraft/network/codec/PacketCodec;}
     */
    PacketCodec<RegistryByteBuf, PositionSource> PACKET_CODEC = PacketCodecs.registryValue(RegistryKeys.POSITION_SOURCE_TYPE)
-      .dispatch(PositionSource::getType, PositionSourceType::m_biyeqjqa);
+      .dispatch(PositionSource::getType, PositionSourceType::getPacketCodec);
 
    /**
     * @mapping {@literal hashed m_mqcaptme Lnet/minecraft/unmapped/C_duzerrml;m_mqcaptme(Lnet/minecraft/unmapped/C_cdctfzbn;)Ljava/util/Optional;}
diff -bur namedTargetSrc/net/minecraft/world/event/PositionSourceType.java namedSrc/net/minecraft/world/event/PositionSourceType.java
--- namedTargetSrc/net/minecraft/world/event/PositionSourceType.java	2024-04-02 02:33:24.100586319 +0000
+++ namedSrc/net/minecraft/world/event/PositionSourceType.java	2024-04-02 02:32:14.552104676 +0000
@@ -29,9 +29,10 @@
    MapCodec<T> getCodec();
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_biyeqjqa Lnet/minecraft/unmapped/C_gwwcurwg;m_biyeqjqa()Lnet/minecraft/unmapped/C_qsrmwluu;}
+    * @mapping {@literal named getPacketCodec Lnet/minecraft/world/event/PositionSourceType;getPacketCodec()Lnet/minecraft/network/codec/PacketCodec;}
     */
-   PacketCodec<RegistryByteBuf, T> m_biyeqjqa();
+   PacketCodec<RegistryByteBuf, T> getPacketCodec();
 
    /**
     * @mapping {@literal hashed m_owdaplkq Lnet/minecraft/unmapped/C_gwwcurwg;m_owdaplkq(Ljava/lang/String;Lnet/minecraft/unmapped/C_gwwcurwg;)Lnet/minecraft/unmapped/C_gwwcurwg;}
diff -bur namedTargetSrc/net/minecraft/world/poi/PointOfInterestStorage.java namedSrc/net/minecraft/world/poi/PointOfInterestStorage.java
--- namedTargetSrc/net/minecraft/world/poi/PointOfInterestStorage.java	2024-04-02 02:33:24.024585835 +0000
+++ namedSrc/net/minecraft/world/poi/PointOfInterestStorage.java	2024-04-02 02:32:14.456103957 +0000
@@ -22,8 +22,6 @@
 import net.minecraft.registry.Holder;
 import net.minecraft.registry.RegistryKey;
 import net.minecraft.registry.tag.PoiTags;
-import net.minecraft.unmapped.C_gwzzviyw;
-import net.minecraft.unmapped.C_tzvgbkzf;
 import net.minecraft.util.Util;
 import net.minecraft.util.annotation.Debug;
 import net.minecraft.util.math.BlockPos;
@@ -35,7 +33,9 @@
 import net.minecraft.world.WorldView;
 import net.minecraft.world.chunk.ChunkSection;
 import net.minecraft.world.chunk.ChunkStatus;
+import net.minecraft.world.storage.RegionStorageKey;
 import net.minecraft.world.storage.SerializingRegionBasedStorage;
+import net.minecraft.world.storage.SimpleRegionStorage;
 
 /**
  * @mapping {@literal hashed net/minecraft/unmapped/C_uegwgivt}
@@ -65,13 +65,13 @@
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_uegwgivt;<init>(Lnet/minecraft/unmapped/C_tzvgbkzf;Ljava/nio/file/Path;Lcom/mojang/datafixers/DataFixer;ZLnet/minecraft/unmapped/C_wqxmvzdq;Lnet/minecraft/unmapped/C_qpninoyb;)V}
-    * @mapping {@literal named <init> Lnet/minecraft/world/poi/PointOfInterestStorage;<init>(Lnet/minecraft/unmapped/C_tzvgbkzf;Ljava/nio/file/Path;Lcom/mojang/datafixers/DataFixer;ZLnet/minecraft/registry/DynamicRegistryManager;Lnet/minecraft/world/HeightLimitView;)V}
+    * @mapping {@literal named <init> Lnet/minecraft/world/poi/PointOfInterestStorage;<init>(Lnet/minecraft/world/storage/RegionStorageKey;Ljava/nio/file/Path;Lcom/mojang/datafixers/DataFixer;ZLnet/minecraft/registry/DynamicRegistryManager;Lnet/minecraft/world/HeightLimitView;)V}
     */
    public PointOfInterestStorage(
-      C_tzvgbkzf arg, Path directory, DataFixer dataFixer, boolean dsync, DynamicRegistryManager registryManager, HeightLimitView world
+      RegionStorageKey storageKey, Path directory, DataFixer dataFixer, boolean dsync, DynamicRegistryManager registryManager, HeightLimitView world
    ) {
       super(
-         new C_gwzzviyw(arg, directory, dataFixer, dsync, DataFixTypes.POI_CHUNK),
+         new SimpleRegionStorage(storageKey, directory, dataFixer, dsync, DataFixTypes.POI_CHUNK),
          PointOfInterestSet::createCodec,
          PointOfInterestSet::new,
          registryManager,
diff -bur namedTargetSrc/net/minecraft/world/storage/EntityChunkDataAccess.java namedSrc/net/minecraft/world/storage/EntityChunkDataAccess.java
--- namedTargetSrc/net/minecraft/world/storage/EntityChunkDataAccess.java	2024-04-02 02:33:24.032585886 +0000
+++ namedSrc/net/minecraft/world/storage/EntityChunkDataAccess.java	2024-04-02 02:32:14.472104076 +0000
@@ -17,7 +17,6 @@
 import net.minecraft.nbt.NbtIntArray;
 import net.minecraft.nbt.NbtList;
 import net.minecraft.server.world.ServerWorld;
-import net.minecraft.unmapped.C_gwzzviyw;
 import net.minecraft.util.math.ChunkPos;
 import net.minecraft.util.thread.TaskExecutor;
 import org.slf4j.Logger;
@@ -48,9 +47,10 @@
     */
    private final ServerWorld world;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_qzlguxdo Lnet/minecraft/unmapped/C_xyuwhjxc;f_qzlguxdo:Lnet/minecraft/unmapped/C_gwzzviyw;}
+    * @mapping {@literal named regionStorage Lnet/minecraft/world/storage/EntityChunkDataAccess;regionStorage:Lnet/minecraft/world/storage/SimpleRegionStorage;}
     */
-   private final C_gwzzviyw f_qzlguxdo;
+   private final SimpleRegionStorage regionStorage;
    /**
     * @mapping {@literal hashed f_lswnhdxi Lnet/minecraft/unmapped/C_xyuwhjxc;f_lswnhdxi:Lit/unimi/dsi/fastutil/longs/LongSet;}
     * @mapping {@literal named emptyChunks Lnet/minecraft/world/storage/EntityChunkDataAccess;emptyChunks:Lit/unimi/dsi/fastutil/longs/LongSet;}
@@ -64,10 +64,10 @@
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_xyuwhjxc;<init>(Lnet/minecraft/unmapped/C_gwzzviyw;Lnet/minecraft/unmapped/C_bdwnwhiu;Ljava/util/concurrent/Executor;)V}
-    * @mapping {@literal named <init> Lnet/minecraft/world/storage/EntityChunkDataAccess;<init>(Lnet/minecraft/unmapped/C_gwzzviyw;Lnet/minecraft/server/world/ServerWorld;Ljava/util/concurrent/Executor;)V}
+    * @mapping {@literal named <init> Lnet/minecraft/world/storage/EntityChunkDataAccess;<init>(Lnet/minecraft/world/storage/SimpleRegionStorage;Lnet/minecraft/server/world/ServerWorld;Ljava/util/concurrent/Executor;)V}
     */
-   public EntityChunkDataAccess(C_gwzzviyw arg, ServerWorld world, Executor executor) {
-      this.f_qzlguxdo = arg;
+   public EntityChunkDataAccess(SimpleRegionStorage regionStorage, ServerWorld world, Executor executor) {
+      this.regionStorage = regionStorage;
       this.world = world;
       this.taskExecutor = TaskExecutor.create(executor, "entity-deserializer");
    }
@@ -79,7 +79,7 @@
    public CompletableFuture<ChunkDataList<Entity>> readChunkData(ChunkPos pos) {
       return this.emptyChunks.contains(pos.toLong())
          ? CompletableFuture.completedFuture(emptyDataList(pos))
-         : this.f_qzlguxdo.m_mdpwegbt(pos).thenApplyAsync(chunkData -> {
+         : this.regionStorage.read(pos).thenApplyAsync(chunkData -> {
             if (chunkData.isEmpty()) {
                this.emptyChunks.add(pos.toLong());
                return emptyDataList(pos);
@@ -93,7 +93,7 @@
                   LOGGER.warn("Failed to parse chunk {} position info", pos, var6);
                }
    
-               NbtCompound lv2 = this.f_qzlguxdo.m_nahuhtnn((NbtCompound)chunkData.get(), -1);
+               NbtCompound lv2 = this.regionStorage.update((NbtCompound)chunkData.get(), -1);
                NbtList lv3 = lv2.getList("Entities", NbtElement.COMPOUND_TYPE);
                List<Entity> list = (List<Entity>)EntityType.streamFromNbt(lv3, this.world).collect(ImmutableList.toImmutableList());
                return new ChunkDataList(pos, list);
@@ -134,7 +134,7 @@
       ChunkPos lv = dataList.getChunkPos();
       if (dataList.isEmpty()) {
          if (this.emptyChunks.add(lv.toLong())) {
-            this.f_qzlguxdo.m_befxtenr(lv, null);
+            this.regionStorage.write(lv, null);
          }
       } else {
          NbtList lv2 = new NbtList();
@@ -147,7 +147,7 @@
          NbtCompound lv3 = NbtHelper.putCurrentDataVersion(new NbtCompound());
          lv3.put("Entities", lv2);
          putChunkPos(lv3, lv);
-         this.f_qzlguxdo.m_befxtenr(lv, lv3).exceptionally(ex -> {
+         this.regionStorage.write(lv, lv3).exceptionally(ex -> {
             LOGGER.error("Failed to store chunk {}", lv, ex);
             return null;
          });
@@ -160,7 +160,7 @@
     */
    @Override
    public void awaitAll(boolean sync) {
-      this.f_qzlguxdo.m_izxybopd(sync).join();
+      this.regionStorage.completeAll(sync).join();
       this.taskExecutor.awaitAll();
    }
 
@@ -169,6 +169,6 @@
     */
    @Override
    public void close() throws IOException {
-      this.f_qzlguxdo.close();
+      this.regionStorage.close();
    }
 }
Only in namedSrc/net/minecraft/world/storage: ParsedSaveProperties.java
Only in namedSrc/net/minecraft/world/storage: RecreatedChunkStorage.java
diff -bur namedTargetSrc/net/minecraft/world/storage/RegionBasedStorage.java namedSrc/net/minecraft/world/storage/RegionBasedStorage.java
--- namedTargetSrc/net/minecraft/world/storage/RegionBasedStorage.java	2024-04-02 02:33:24.032585886 +0000
+++ namedSrc/net/minecraft/world/storage/RegionBasedStorage.java	2024-04-02 02:32:14.468104047 +0000
@@ -9,7 +9,6 @@
 import net.minecraft.nbt.NbtIo;
 import net.minecraft.nbt.NbtTagSizeTracker;
 import net.minecraft.nbt.scanner.NbtScanner;
-import net.minecraft.unmapped.C_tzvgbkzf;
 import net.minecraft.util.FileNameUtil;
 import net.minecraft.util.ThrowableDeliverer;
 import net.minecraft.util.math.ChunkPos;
@@ -38,7 +37,7 @@
    /**
     * Mapping not found
     */
-   private final C_tzvgbkzf f_nxkrwrip;
+   private final RegionStorageKey f_nxkrwrip;
    /**
     * @mapping {@literal hashed f_armdwyzd Lnet/minecraft/unmapped/C_ivfseflh;f_armdwyzd:Ljava/nio/file/Path;}
     * @mapping {@literal named directory Lnet/minecraft/world/storage/RegionBasedStorage;directory:Ljava/nio/file/Path;}
@@ -52,9 +51,9 @@
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_ivfseflh;<init>(Lnet/minecraft/unmapped/C_tzvgbkzf;Ljava/nio/file/Path;Z)V}
-    * @mapping {@literal named <init> Lnet/minecraft/world/storage/RegionBasedStorage;<init>(Lnet/minecraft/unmapped/C_tzvgbkzf;Ljava/nio/file/Path;Z)V}
+    * @mapping {@literal named <init> Lnet/minecraft/world/storage/RegionBasedStorage;<init>(Lnet/minecraft/world/storage/RegionStorageKey;Ljava/nio/file/Path;Z)V}
     */
-   RegionBasedStorage(C_tzvgbkzf arg, Path directory, boolean dsync) {
+   RegionBasedStorage(RegionStorageKey arg, Path directory, boolean dsync) {
       this.directory = directory;
       this.dsync = dsync;
       this.f_nxkrwrip = arg;
diff -bur namedTargetSrc/net/minecraft/world/storage/RegionFile.java namedSrc/net/minecraft/world/storage/RegionFile.java
--- namedTargetSrc/net/minecraft/world/storage/RegionFile.java	2024-04-02 02:33:24.156586676 +0000
+++ namedSrc/net/minecraft/world/storage/RegionFile.java	2024-04-02 02:32:14.616105156 +0000
@@ -16,7 +16,6 @@
 import java.nio.file.Path;
 import java.nio.file.StandardCopyOption;
 import java.nio.file.StandardOpenOption;
-import net.minecraft.unmapped.C_tzvgbkzf;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.Util;
 import net.minecraft.util.math.ChunkPos;
@@ -83,7 +82,7 @@
    /**
     * Mapping not found
     */
-   final C_tzvgbkzf f_xepxlwml;
+   final RegionStorageKey f_xepxlwml;
    /**
     * Mapping not found
     */
@@ -126,18 +125,19 @@
    protected final SectorMap sectors = new SectorMap();
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_kykyawqb;<init>(Lnet/minecraft/unmapped/C_tzvgbkzf;Ljava/nio/file/Path;Ljava/nio/file/Path;Z)V}
+    * @mapping {@literal named <init> Lnet/minecraft/world/storage/RegionFile;<init>(Lnet/minecraft/world/storage/RegionStorageKey;Ljava/nio/file/Path;Ljava/nio/file/Path;Z)V}
     */
-   public RegionFile(C_tzvgbkzf arg, Path path, Path path2, boolean bl) throws IOException {
-      this(arg, path, path2, ChunkStreamVersion.m_xrfyqkft(), bl);
+   public RegionFile(RegionStorageKey storageKey, Path path, Path path2, boolean bl) throws IOException {
+      this(storageKey, path, path2, ChunkStreamVersion.m_xrfyqkft(), bl);
    }
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_kykyawqb;<init>(Lnet/minecraft/unmapped/C_tzvgbkzf;Ljava/nio/file/Path;Ljava/nio/file/Path;Lnet/minecraft/unmapped/C_jrihwgqn;Z)V}
-    * @mapping {@literal named <init> Lnet/minecraft/world/storage/RegionFile;<init>(Lnet/minecraft/unmapped/C_tzvgbkzf;Ljava/nio/file/Path;Ljava/nio/file/Path;Lnet/minecraft/world/storage/ChunkStreamVersion;Z)V}
+    * @mapping {@literal named <init> Lnet/minecraft/world/storage/RegionFile;<init>(Lnet/minecraft/world/storage/RegionStorageKey;Ljava/nio/file/Path;Ljava/nio/file/Path;Lnet/minecraft/world/storage/ChunkStreamVersion;Z)V}
     */
-   public RegionFile(C_tzvgbkzf arg, Path path, Path directory, ChunkStreamVersion outputChunkStreamVersion, boolean bl) throws IOException {
-      this.f_xepxlwml = arg;
+   public RegionFile(RegionStorageKey storageKey, Path path, Path directory, ChunkStreamVersion outputChunkStreamVersion, boolean bl) throws IOException {
+      this.f_xepxlwml = storageKey;
       this.f_ueduioyw = path;
       this.outputChunkStreamVersion = outputChunkStreamVersion;
       if (!Files.isDirectory(directory, new LinkOption[0])) {
Only in namedSrc/net/minecraft/world/storage: RegionStorageKey.java
diff -bur namedTargetSrc/net/minecraft/world/storage/SerializingRegionBasedStorage.java namedSrc/net/minecraft/world/storage/SerializingRegionBasedStorage.java
--- namedTargetSrc/net/minecraft/world/storage/SerializingRegionBasedStorage.java	2024-04-02 02:33:24.236587185 +0000
+++ namedSrc/net/minecraft/world/storage/SerializingRegionBasedStorage.java	2024-04-02 02:32:14.676105605 +0000
@@ -24,7 +24,6 @@
 import net.minecraft.nbt.NbtOps;
 import net.minecraft.registry.DynamicRegistryManager;
 import net.minecraft.registry.RegistryOps;
-import net.minecraft.unmapped.C_gwzzviyw;
 import net.minecraft.util.Util;
 import net.minecraft.util.math.ChunkPos;
 import net.minecraft.util.math.ChunkSectionPos;
@@ -50,7 +49,7 @@
    /**
     * Mapping not found
     */
-   private final C_gwzzviyw f_vuuorrbx;
+   private final SimpleRegionStorage f_vuuorrbx;
    /**
     * @mapping {@literal hashed f_fonmahly Lnet/minecraft/unmapped/C_suaauzrg;f_fonmahly:Lit/unimi/dsi/fastutil/longs/Long2ObjectMap;}
     * @mapping {@literal named loadedElements Lnet/minecraft/world/storage/SerializingRegionBasedStorage;loadedElements:Lit/unimi/dsi/fastutil/longs/Long2ObjectMap;}
@@ -84,12 +83,16 @@
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_suaauzrg;<init>(Lnet/minecraft/unmapped/C_gwzzviyw;Ljava/util/function/Function;Ljava/util/function/Function;Lnet/minecraft/unmapped/C_wqxmvzdq;Lnet/minecraft/unmapped/C_qpninoyb;)V}
-    * @mapping {@literal named <init> Lnet/minecraft/world/storage/SerializingRegionBasedStorage;<init>(Lnet/minecraft/unmapped/C_gwzzviyw;Ljava/util/function/Function;Ljava/util/function/Function;Lnet/minecraft/registry/DynamicRegistryManager;Lnet/minecraft/world/HeightLimitView;)V}
+    * @mapping {@literal named <init> Lnet/minecraft/world/storage/SerializingRegionBasedStorage;<init>(Lnet/minecraft/world/storage/SimpleRegionStorage;Ljava/util/function/Function;Ljava/util/function/Function;Lnet/minecraft/registry/DynamicRegistryManager;Lnet/minecraft/world/HeightLimitView;)V}
     */
    public SerializingRegionBasedStorage(
-      C_gwzzviyw arg, Function<Runnable, Codec<R>> codecFactory, Function<Runnable, R> factory, DynamicRegistryManager registryManager, HeightLimitView world
+      SimpleRegionStorage regionStorage,
+      Function<Runnable, Codec<R>> codecFactory,
+      Function<Runnable, R> factory,
+      DynamicRegistryManager registryManager,
+      HeightLimitView world
    ) {
-      this.f_vuuorrbx = arg;
+      this.f_vuuorrbx = regionStorage;
       this.codecFactory = codecFactory;
       this.factory = factory;
       this.registryManager = registryManager;
@@ -182,7 +185,7 @@
    private void loadDataAt(ChunkPos chunkPos) {
       Optional<NbtCompound> optional = (Optional<NbtCompound>)this.loadNbt(chunkPos).join();
       RegistryOps<NbtElement> lv = this.registryManager.createSerializationContext(NbtOps.INSTANCE);
-      this.m_hosgsbzq(chunkPos, lv, (NbtCompound)optional.orElse(null));
+      this.readColumn(chunkPos, lv, (NbtCompound)optional.orElse(null));
    }
 
    /**
@@ -190,7 +193,7 @@
     * @mapping {@literal named loadNbt Lnet/minecraft/world/storage/SerializingRegionBasedStorage;loadNbt(Lnet/minecraft/util/math/ChunkPos;)Ljava/util/concurrent/CompletableFuture;}
     */
    private CompletableFuture<Optional<NbtCompound>> loadNbt(ChunkPos pos) {
-      return this.f_vuuorrbx.m_mdpwegbt(pos).exceptionally(throwable -> {
+      return this.f_vuuorrbx.read(pos).exceptionally(throwable -> {
          if (throwable instanceof IOException iOException) {
             LOGGER.error("Error reading chunk {} data from disk", pos, iOException);
             return Optional.empty();
@@ -201,23 +204,24 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_hosgsbzq Lnet/minecraft/unmapped/C_suaauzrg;m_hosgsbzq(Lnet/minecraft/unmapped/C_ynrszrtu;Lnet/minecraft/unmapped/C_piadqmzm;Lnet/minecraft/unmapped/C_hhlwcnih;)V}
+    * @mapping {@literal named readColumn Lnet/minecraft/world/storage/SerializingRegionBasedStorage;readColumn(Lnet/minecraft/util/math/ChunkPos;Lnet/minecraft/registry/RegistryOps;Lnet/minecraft/nbt/NbtCompound;)V}
     */
-   private void m_hosgsbzq(ChunkPos arg, RegistryOps<NbtElement> arg2, @Nullable NbtCompound arg3) {
-      if (arg3 == null) {
+   private void readColumn(ChunkPos pos, RegistryOps<NbtElement> ops, @Nullable NbtCompound nbt) {
+      if (nbt == null) {
          for (int i = this.world.getBottomSectionCoord(); i < this.world.getTopSectionCoord(); i++) {
-            this.loadedElements.put(toChunkPosLong(arg, i), Optional.empty());
+            this.loadedElements.put(toChunkPosLong(pos, i), Optional.empty());
          }
       } else {
-         Dynamic<NbtElement> dynamic = new Dynamic<>(arg2, arg3);
+         Dynamic<NbtElement> dynamic = new Dynamic<>(ops, nbt);
          int j = getDataVersion(dynamic);
          int k = SharedConstants.getGameVersion().getWorldVersionData().getDataVersion();
          boolean bl = j != k;
-         Dynamic<NbtElement> dynamic2 = this.f_vuuorrbx.m_dfyctifq(dynamic, j);
+         Dynamic<NbtElement> dynamic2 = this.f_vuuorrbx.update(dynamic, j);
          OptionalDynamic<NbtElement> optionalDynamic = dynamic2.get("Sections");
 
          for (int l = this.world.getBottomSectionCoord(); l < this.world.getTopSectionCoord(); l++) {
-            long m = toChunkPosLong(arg, l);
+            long m = toChunkPosLong(pos, l);
             Optional<R> optional = optionalDynamic.get(Integer.toString(l))
                .result()
                .flatMap(dynamicx -> ((Codec)this.codecFactory.apply((Runnable)() -> this.onUpdate(m))).parse(dynamicx).resultOrPartial(LOGGER::error));
@@ -241,7 +245,7 @@
       Dynamic<NbtElement> dynamic = this.serialize(pos, lv);
       NbtElement lv2 = dynamic.getValue();
       if (lv2 instanceof NbtCompound) {
-         this.f_vuuorrbx.m_befxtenr(pos, (NbtCompound)lv2);
+         this.f_vuuorrbx.write(pos, (NbtCompound)lv2);
       } else {
          LOGGER.error("Expected compound tag, got {}", lv2);
       }
Only in namedSrc/net/minecraft/world/storage: SimpleRegionRecreationStorage.java
Only in namedSrc/net/minecraft/world/storage: SimpleRegionStorage.java
diff -bur namedTargetSrc/net/minecraft/world/storage/StorageIoWorker.java namedSrc/net/minecraft/world/storage/StorageIoWorker.java
--- namedTargetSrc/net/minecraft/world/storage/StorageIoWorker.java	2024-04-02 02:33:24.260587339 +0000
+++ namedSrc/net/minecraft/world/storage/StorageIoWorker.java	2024-04-02 02:32:14.700105784 +0000
@@ -21,7 +21,6 @@
 import net.minecraft.nbt.scanner.NbtScanner;
 import net.minecraft.nbt.scanner.SelectiveNbtCollector;
 import net.minecraft.nbt.visitor.FieldSelector;
-import net.minecraft.unmapped.C_tzvgbkzf;
 import net.minecraft.util.Unit;
 import net.minecraft.util.Util;
 import net.minecraft.util.math.ChunkPos;
@@ -74,12 +73,12 @@
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_ffgsaknh;<init>(Lnet/minecraft/unmapped/C_tzvgbkzf;Ljava/nio/file/Path;Z)V}
-    * @mapping {@literal named <init> Lnet/minecraft/world/storage/StorageIoWorker;<init>(Lnet/minecraft/unmapped/C_tzvgbkzf;Ljava/nio/file/Path;Z)V}
+    * @mapping {@literal named <init> Lnet/minecraft/world/storage/StorageIoWorker;<init>(Lnet/minecraft/world/storage/RegionStorageKey;Ljava/nio/file/Path;Z)V}
     */
-   protected StorageIoWorker(C_tzvgbkzf arg, Path directory, boolean dsync) {
-      this.storage = new RegionBasedStorage(arg, directory, dsync);
+   protected StorageIoWorker(RegionStorageKey storageKey, Path directory, boolean dsync) {
+      this.storage = new RegionBasedStorage(storageKey, directory, dsync);
       this.executor = new TaskExecutor<>(
-         new TaskQueue.Prioritized(StorageIoWorker.Priority.values().length), Util.getIoWorkerExecutor(), "IOWorker-" + arg.type()
+         new TaskQueue.Prioritized(StorageIoWorker.Priority.values().length), Util.getIoWorkerExecutor(), "IOWorker-" + storageKey.type()
       );
    }
 
diff -bur namedTargetSrc/net/minecraft/world/storage/VersionedChunkStorage.java namedSrc/net/minecraft/world/storage/VersionedChunkStorage.java
--- namedTargetSrc/net/minecraft/world/storage/VersionedChunkStorage.java	2024-04-02 02:33:24.292587543 +0000
+++ namedSrc/net/minecraft/world/storage/VersionedChunkStorage.java	2024-04-02 02:32:14.736106054 +0000
@@ -12,7 +12,6 @@
 import net.minecraft.nbt.NbtCompound;
 import net.minecraft.nbt.NbtHelper;
 import net.minecraft.registry.RegistryKey;
-import net.minecraft.unmapped.C_tzvgbkzf;
 import net.minecraft.util.math.ChunkPos;
 import net.minecraft.world.FeatureUpdater;
 import net.minecraft.world.PersistentStateManager;
@@ -50,11 +49,11 @@
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_hzmyuskp;<init>(Lnet/minecraft/unmapped/C_tzvgbkzf;Ljava/nio/file/Path;Lcom/mojang/datafixers/DataFixer;Z)V}
-    * @mapping {@literal named <init> Lnet/minecraft/world/storage/VersionedChunkStorage;<init>(Lnet/minecraft/unmapped/C_tzvgbkzf;Ljava/nio/file/Path;Lcom/mojang/datafixers/DataFixer;Z)V}
+    * @mapping {@literal named <init> Lnet/minecraft/world/storage/VersionedChunkStorage;<init>(Lnet/minecraft/world/storage/RegionStorageKey;Ljava/nio/file/Path;Lcom/mojang/datafixers/DataFixer;Z)V}
     */
-   public VersionedChunkStorage(C_tzvgbkzf arg, Path directory, DataFixer dataFixer, boolean dsync) {
+   public VersionedChunkStorage(RegionStorageKey storageKey, Path directory, DataFixer dataFixer, boolean dsync) {
       this.dataFixer = dataFixer;
-      this.worker = new StorageIoWorker(arg, directory, dsync);
+      this.worker = new StorageIoWorker(storageKey, directory, dsync);
    }
 
    /**
@@ -148,16 +147,17 @@
     * @mapping {@literal named setNbt Lnet/minecraft/world/storage/VersionedChunkStorage;setNbt(Lnet/minecraft/util/math/ChunkPos;Lnet/minecraft/nbt/NbtCompound;)Ljava/util/concurrent/CompletableFuture;}
     */
    public CompletableFuture<Void> setNbt(ChunkPos chunkPos, NbtCompound nbt) {
-      this.m_wnctjgkh(chunkPos);
+      this.markFeatureUpdaterResolved(chunkPos);
       return this.worker.setResult(chunkPos, nbt);
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_wnctjgkh Lnet/minecraft/unmapped/C_hzmyuskp;m_wnctjgkh(Lnet/minecraft/unmapped/C_ynrszrtu;)V}
+    * @mapping {@literal named markFeatureUpdaterResolved Lnet/minecraft/world/storage/VersionedChunkStorage;markFeatureUpdaterResolved(Lnet/minecraft/util/math/ChunkPos;)V}
     */
-   protected void m_wnctjgkh(ChunkPos arg) {
+   protected void markFeatureUpdaterResolved(ChunkPos pos) {
       if (this.featureUpdater != null) {
-         this.featureUpdater.markResolved(arg.toLong());
+         this.featureUpdater.markResolved(pos.toLong());
       }
    }
 
@@ -170,7 +170,8 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed close Lnet/minecraft/unmapped/C_hzmyuskp;close()V}
+    * @mapping {@literal named close Lnet/minecraft/world/storage/VersionedChunkStorage;close()V}
     */
    public void close() throws IOException {
       this.worker.close();
diff -bur namedTargetSrc/net/minecraft/world/storage/WorldSaveStorage.java namedSrc/net/minecraft/world/storage/WorldSaveStorage.java
--- namedTargetSrc/net/minecraft/world/storage/WorldSaveStorage.java	2024-04-02 02:33:24.324587746 +0000
+++ namedSrc/net/minecraft/world/storage/WorldSaveStorage.java	2024-04-02 02:32:14.772106324 +0000
@@ -55,7 +55,6 @@
 import net.minecraft.server.world.FeatureAndDataSettings;
 import net.minecraft.text.Text;
 import net.minecraft.unmapped.C_prxxuhrw;
-import net.minecraft.unmapped.C_qhzfxdhh;
 import net.minecraft.util.DateTimeFormatterFactory;
 import net.minecraft.util.FileNameUtil;
 import net.minecraft.util.Identifier;
@@ -117,9 +116,10 @@
     */
    private static final int MAX_LEVEL_DATA_SIZE = 104857600;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_dgohnkjg Lnet/minecraft/unmapped/C_bpwagnit;f_dgohnkjg:I}
+    * @mapping {@literal named DISK_SPACE_WARNING_THRESHOLD Lnet/minecraft/world/storage/WorldSaveStorage;DISK_SPACE_WARNING_THRESHOLD:I}
     */
-   private static final int f_dgohnkjg = 67108864;
+   private static final int DISK_SPACE_WARNING_THRESHOLD = 67108864;
    /**
     * @mapping {@literal hashed f_rbwrlarm Lnet/minecraft/unmapped/C_bpwagnit;f_rbwrlarm:Ljava/nio/file/Path;}
     * @mapping {@literal named savesDirectory Lnet/minecraft/world/storage/WorldSaveStorage;savesDirectory:Ljava/nio/file/Path;}
@@ -223,9 +223,9 @@
 
    /**
     * @mapping {@literal hashed m_lcpzaqzh Lnet/minecraft/unmapped/C_bpwagnit;m_lcpzaqzh(Lcom/mojang/serialization/Dynamic;Lnet/minecraft/unmapped/C_yknpgzdr;Lnet/minecraft/unmapped/C_tqxyjqsk;Lnet/minecraft/unmapped/C_wqxmvzdq$C_ggmzysrd;)Lnet/minecraft/unmapped/C_qhzfxdhh;}
-    * @mapping {@literal named m_lcpzaqzh Lnet/minecraft/world/storage/WorldSaveStorage;m_lcpzaqzh(Lcom/mojang/serialization/Dynamic;Lnet/minecraft/server/world/FeatureAndDataSettings;Lnet/minecraft/registry/Registry;Lnet/minecraft/registry/DynamicRegistryManager$Frozen;)Lnet/minecraft/unmapped/C_qhzfxdhh;}
+    * @mapping {@literal named m_lcpzaqzh Lnet/minecraft/world/storage/WorldSaveStorage;m_lcpzaqzh(Lcom/mojang/serialization/Dynamic;Lnet/minecraft/server/world/FeatureAndDataSettings;Lnet/minecraft/registry/Registry;Lnet/minecraft/registry/DynamicRegistryManager$Frozen;)Lnet/minecraft/world/storage/ParsedSaveProperties;}
     */
-   public static C_qhzfxdhh m_lcpzaqzh(
+   public static ParsedSaveProperties m_lcpzaqzh(
       Dynamic<?> dynamic, FeatureAndDataSettings featureAndDataSettings, Registry<DimensionOptions> registry, DynamicRegistryManager.Frozen arg3
    ) {
       Dynamic<?> dynamic2 = RegistryOps.m_cbajopsh(dynamic, arg3);
@@ -235,7 +235,7 @@
       WorldDimensions.Baked lv3 = lv.getDimensions().bake(registry);
       Lifecycle lifecycle = lv3.getLifecycle().add(arg3.getLifecycleForAllRegistries());
       WorldSaveProperties lv4 = WorldSaveProperties.readProperties(dynamic2, lv2, lv3.specialWorldProperty(), lv.options(), lifecycle);
-      return new C_qhzfxdhh(lv4, lv3);
+      return new ParsedSaveProperties(lv4, lv3);
    }
 
    /**

@github-actions
Copy link

Choose a reason for hiding this comment

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

View the diff here (3/3): 
diff -bur namedTargetSrc/net/minecraft/world/TrialSpawnerLogic.java namedSrc/net/minecraft/world/TrialSpawnerLogic.java
--- namedTargetSrc/net/minecraft/world/TrialSpawnerLogic.java	2024-04-02 02:33:24.016585784 +0000
+++ namedSrc/net/minecraft/world/TrialSpawnerLogic.java	2024-04-02 02:32:14.448103897 +0000
@@ -83,26 +83,30 @@
     */
    private static final float AMBIENT_SOUND_CHANCE = 0.02F;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_xvaxtoox Lnet/minecraft/unmapped/C_jelkcvqk;f_xvaxtoox:Lnet/minecraft/unmapped/C_pocjjnjk;}
+    * @mapping {@literal named normalConfig Lnet/minecraft/world/TrialSpawnerLogic;normalConfig:Lnet/minecraft/block/TrialSpawnerConfig;}
     */
-   private final TrialSpawnerConfig f_xvaxtoox;
+   private final TrialSpawnerConfig normalConfig;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_xcfvwbbl Lnet/minecraft/unmapped/C_jelkcvqk;f_xcfvwbbl:Lnet/minecraft/unmapped/C_pocjjnjk;}
+    * @mapping {@literal named ominousConfig Lnet/minecraft/world/TrialSpawnerLogic;ominousConfig:Lnet/minecraft/block/TrialSpawnerConfig;}
     */
-   private final TrialSpawnerConfig f_xcfvwbbl;
+   private final TrialSpawnerConfig ominousConfig;
    /**
     * @mapping {@literal hashed f_gtjnizww Lnet/minecraft/unmapped/C_jelkcvqk;f_gtjnizww:Lnet/minecraft/unmapped/C_kxkfzuix;}
     * @mapping {@literal named data Lnet/minecraft/world/TrialSpawnerLogic;data:Lnet/minecraft/block/TrialSpawnerData;}
     */
    private final TrialSpawnerData data;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_domukczm Lnet/minecraft/unmapped/C_jelkcvqk;f_domukczm:I}
+    * @mapping {@literal named requiredPlayerRange Lnet/minecraft/world/TrialSpawnerLogic;requiredPlayerRange:I}
     */
-   private final int f_domukczm;
+   private final int requiredPlayerRange;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_nalzpmxu Lnet/minecraft/unmapped/C_jelkcvqk;f_nalzpmxu:I}
+    * @mapping {@literal named targetCooldownLength Lnet/minecraft/world/TrialSpawnerLogic;targetCooldownLength:I}
     */
-   private final int f_nalzpmxu;
+   private final int targetCooldownLength;
    /**
     * @mapping {@literal hashed f_jgbopvuf Lnet/minecraft/unmapped/C_jelkcvqk;f_jgbopvuf:Lnet/minecraft/unmapped/C_jelkcvqk$C_onmhuuws;}
     * @mapping {@literal named spawner Lnet/minecraft/world/TrialSpawnerLogic;spawner:Lnet/minecraft/world/TrialSpawnerLogic$TrialSpawner;}
@@ -124,9 +128,10 @@
     */
    private boolean forceSpawning;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_oeictsyk Lnet/minecraft/unmapped/C_jelkcvqk;f_oeictsyk:Z}
+    * @mapping {@literal named ominous Lnet/minecraft/world/TrialSpawnerLogic;ominous:Z}
     */
-   private boolean f_oeictsyk;
+   private boolean ominous;
 
    /**
     * @mapping {@literal hashed m_hvfivtpr Lnet/minecraft/unmapped/C_jelkcvqk;m_hvfivtpr()Lcom/mojang/serialization/Codec;}
@@ -138,7 +143,7 @@
                   TrialSpawnerConfig.CODEC.optionalFieldOf("normal_config", TrialSpawnerConfig.DEFAULT_INSTANCE).forGetter(TrialSpawnerLogic::getNormalConfig),
                   TrialSpawnerConfig.CODEC
                      .optionalFieldOf("ominous_config", TrialSpawnerConfig.DEFAULT_INSTANCE)
-                     .forGetter(TrialSpawnerLogic::getOminousConfig),
+                     .forGetter(TrialSpawnerLogic::getOminousConfigForSerialization),
                   TrialSpawnerData.codec.forGetter(TrialSpawnerLogic::getData),
                   Codec.intRange(0, Integer.MAX_VALUE).optionalFieldOf("target_cooldown_length", 36000).forGetter(TrialSpawnerLogic::getTargetCooldownLength),
                   Codec.intRange(1, 128).optionalFieldOf("required_player_range", 14).forGetter(TrialSpawnerLogic::getRequiredPlayerRange)
@@ -174,20 +179,20 @@
     * @mapping {@literal named <init> Lnet/minecraft/world/TrialSpawnerLogic;<init>(Lnet/minecraft/block/TrialSpawnerConfig;Lnet/minecraft/block/TrialSpawnerConfig;Lnet/minecraft/block/TrialSpawnerData;IILnet/minecraft/world/TrialSpawnerLogic$TrialSpawner;Lnet/minecraft/world/EntityDetector;Lnet/minecraft/world/EntityDetector$EntitySelector;)V}
     */
    public TrialSpawnerLogic(
-      TrialSpawnerConfig arg,
-      TrialSpawnerConfig arg2,
+      TrialSpawnerConfig normalConfig,
+      TrialSpawnerConfig ominousConfig,
       TrialSpawnerData data,
-      int i,
-      int j,
+      int targetCooldownLength,
+      int requiredPlayerRange,
       TrialSpawnerLogic.TrialSpawner spawner,
       EntityDetector playerDetector,
       EntityDetector.EntitySelector playerDetectionSelector
    ) {
-      this.f_xvaxtoox = arg;
-      this.f_xcfvwbbl = arg2;
+      this.normalConfig = normalConfig;
+      this.ominousConfig = ominousConfig;
       this.data = data;
-      this.f_nalzpmxu = i;
-      this.f_domukczm = j;
+      this.targetCooldownLength = targetCooldownLength;
+      this.requiredPlayerRange = requiredPlayerRange;
       this.spawner = spawner;
       this.playerDetector = playerDetector;
       this.playerDetectionSelector = playerDetectionSelector;
@@ -198,7 +203,7 @@
     * @mapping {@literal named getConfig Lnet/minecraft/world/TrialSpawnerLogic;getConfig()Lnet/minecraft/block/TrialSpawnerConfig;}
     */
    public TrialSpawnerConfig getConfig() {
-      return this.f_oeictsyk ? this.f_xcfvwbbl : this.f_xvaxtoox;
+      return this.ominous ? this.ominousConfig : this.normalConfig;
    }
 
    /**
@@ -207,23 +212,24 @@
     */
    @VisibleForTesting
    public TrialSpawnerConfig getNormalConfig() {
-      return this.f_xvaxtoox;
+      return this.normalConfig;
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_hxfvrqzw Lnet/minecraft/unmapped/C_jelkcvqk;m_hxfvrqzw()Lnet/minecraft/unmapped/C_pocjjnjk;}
+    * @mapping {@literal named getOminousConfig Lnet/minecraft/world/TrialSpawnerLogic;getOminousConfig()Lnet/minecraft/block/TrialSpawnerConfig;}
     */
    @VisibleForTesting
-   public TrialSpawnerConfig m_hxfvrqzw() {
-      return this.f_xcfvwbbl;
+   public TrialSpawnerConfig getOminousConfig() {
+      return this.ominousConfig;
    }
 
    /**
     * @mapping {@literal hashed m_kfckfdkf Lnet/minecraft/unmapped/C_jelkcvqk;m_kfckfdkf()Lnet/minecraft/unmapped/C_pocjjnjk;}
-    * @mapping {@literal named getOminousConfig Lnet/minecraft/world/TrialSpawnerLogic;getOminousConfig()Lnet/minecraft/block/TrialSpawnerConfig;}
+    * @mapping {@literal named getOminousConfigForSerialization Lnet/minecraft/world/TrialSpawnerLogic;getOminousConfigForSerialization()Lnet/minecraft/block/TrialSpawnerConfig;}
     */
-   private TrialSpawnerConfig getOminousConfig() {
-      return !this.f_xcfvwbbl.equals(this.f_xvaxtoox) ? this.f_xcfvwbbl : TrialSpawnerConfig.DEFAULT_INSTANCE;
+   private TrialSpawnerConfig getOminousConfigForSerialization() {
+      return !this.ominousConfig.equals(this.normalConfig) ? this.ominousConfig : TrialSpawnerConfig.DEFAULT_INSTANCE;
    }
 
    /**
@@ -233,7 +239,7 @@
    public void m_oadpbnsh(ServerWorld world, BlockPos pos) {
       world.setBlockState(pos, world.getBlockState(pos).with(TrialSpawnerBlock.f_lutdwvub, Boolean.valueOf(true)), Block.NOTIFY_ALL);
       world.syncWorldEvent(3020, pos, 1);
-      this.f_oeictsyk = true;
+      this.ominous = true;
       this.data.m_whezyyzf(this, world);
    }
 
@@ -243,14 +249,15 @@
     */
    public void m_nszglagl(ServerWorld world, BlockPos pos) {
       world.setBlockState(pos, world.getBlockState(pos).with(TrialSpawnerBlock.f_lutdwvub, Boolean.valueOf(false)), Block.NOTIFY_ALL);
-      this.f_oeictsyk = false;
+      this.ominous = false;
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_dgbojbgg Lnet/minecraft/unmapped/C_jelkcvqk;m_dgbojbgg()Z}
+    * @mapping {@literal named isOminous Lnet/minecraft/world/TrialSpawnerLogic;isOminous()Z}
     */
-   public boolean m_dgbojbgg() {
-      return this.f_oeictsyk;
+   public boolean isOminous() {
+      return this.ominous;
    }
 
    /**
@@ -266,7 +273,7 @@
     * @mapping {@literal named getTargetCooldownLength Lnet/minecraft/world/TrialSpawnerLogic;getTargetCooldownLength()I}
     */
    public int getTargetCooldownLength() {
-      return this.f_nalzpmxu;
+      return this.targetCooldownLength;
    }
 
    /**
@@ -274,7 +281,7 @@
     * @mapping {@literal named getRequiredPlayerRange Lnet/minecraft/world/TrialSpawnerLogic;getRequiredPlayerRange()I}
     */
    public int getRequiredPlayerRange() {
-      return this.f_domukczm;
+      return this.requiredPlayerRange;
    }
 
    /**
@@ -388,7 +395,7 @@
                      if (!world.shouldCreateNewEntityWithPassenger(lv8)) {
                         return Optional.empty();
                      } else {
-                        TrialSpawnerLogic.C_vhsnwpwm lv10 = this.f_oeictsyk ? TrialSpawnerLogic.C_vhsnwpwm.OMINOUS : TrialSpawnerLogic.C_vhsnwpwm.NORMAL;
+                        TrialSpawnerLogic.C_vhsnwpwm lv10 = this.ominous ? TrialSpawnerLogic.C_vhsnwpwm.OMINOUS : TrialSpawnerLogic.C_vhsnwpwm.NORMAL;
                         world.syncWorldEvent(WorldEvents.TRIAL_SPAWNER_SPAWNS_MOB, pos, lv10.m_cyctivcj());
                         world.syncWorldEvent(WorldEvents.TRIAL_SPAWNER_SPAWNS_MOB_AT_POS, lv6, lv10.m_cyctivcj());
                         world.emitGameEvent(lv8, GameEvent.ENTITY_PLACE, lv6);
@@ -422,12 +429,12 @@
     * @mapping {@literal hashed m_bftllosi Lnet/minecraft/unmapped/C_jelkcvqk;m_bftllosi(Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Z)V}
     * @mapping {@literal named tickClient Lnet/minecraft/world/TrialSpawnerLogic;tickClient(Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;Z)V}
     */
-   public void tickClient(World world, BlockPos pos, boolean bl) {
+   public void tickClient(World world, BlockPos pos, boolean ominous) {
       if (!this.canSpawnMobs(world)) {
          this.data.lastDisplayEntityRotation = this.data.displayEntityRotation;
       } else {
          TrialSpawnerState lv = this.getState();
-         lv.emitParticle(world, pos, bl);
+         lv.emitParticle(world, pos, ominous);
          if (lv.hasRotatingEntity()) {
             double d = (double)Math.max(0L, this.data.nextMobSpawnTime - world.getTime());
             this.data.lastDisplayEntityRotation = this.data.displayEntityRotation;
@@ -437,7 +444,7 @@
          if (lv.isCapableOfSpawning()) {
             RandomGenerator lv2 = world.getRandom();
             if (lv2.nextFloat() <= 0.02F) {
-               SoundEvent lv3 = bl ? SoundEvents.BLOCK_TRIAL_SPAWNER_AMBIENT_CHARGED : SoundEvents.BLOCK_TRIAL_SPAWNER_AMBIENT;
+               SoundEvent lv3 = ominous ? SoundEvents.BLOCK_TRIAL_SPAWNER_AMBIENT_CHARGED : SoundEvents.BLOCK_TRIAL_SPAWNER_AMBIENT;
                world.playSound(pos, lv3, SoundCategory.BLOCKS, lv2.nextFloat() * 0.25F + 0.75F, lv2.nextFloat() + 0.5F, false);
             }
          }
@@ -448,8 +455,8 @@
     * @mapping {@literal hashed m_mugawpjd Lnet/minecraft/unmapped/C_jelkcvqk;m_mugawpjd(Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_hynzadkk;Z)V}
     * @mapping {@literal named tickServer Lnet/minecraft/world/TrialSpawnerLogic;tickServer(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/util/math/BlockPos;Z)V}
     */
-   public void tickServer(ServerWorld world, BlockPos pos, boolean bl) {
-      this.f_oeictsyk = bl;
+   public void tickServer(ServerWorld world, BlockPos pos, boolean ominous) {
+      this.ominous = ominous;
       TrialSpawnerState lv = this.getState();
       if (!this.canSpawnMobs(world)) {
          if (lv.isCapableOfSpawning()) {
diff -bur namedTargetSrc/net/minecraft/world/updater/WorldUpdater.java namedSrc/net/minecraft/world/updater/WorldUpdater.java
--- namedTargetSrc/net/minecraft/world/updater/WorldUpdater.java	2024-04-02 02:33:24.308587644 +0000
+++ namedSrc/net/minecraft/world/updater/WorldUpdater.java	2024-04-02 02:32:14.756106203 +0000
@@ -32,10 +32,6 @@
 import net.minecraft.registry.RegistryKeys;
 import net.minecraft.text.MutableText;
 import net.minecraft.text.Text;
-import net.minecraft.unmapped.C_gwzzviyw;
-import net.minecraft.unmapped.C_qchnagao;
-import net.minecraft.unmapped.C_tzvgbkzf;
-import net.minecraft.unmapped.C_uukidwhx;
 import net.minecraft.util.Util;
 import net.minecraft.util.crash.CrashException;
 import net.minecraft.util.math.ChunkPos;
@@ -43,7 +39,11 @@
 import net.minecraft.world.World;
 import net.minecraft.world.dimension.DimensionOptions;
 import net.minecraft.world.gen.chunk.ChunkGenerator;
+import net.minecraft.world.storage.RecreatedChunkStorage;
 import net.minecraft.world.storage.RegionFile;
+import net.minecraft.world.storage.RegionStorageKey;
+import net.minecraft.world.storage.SimpleRegionRecreationStorage;
+import net.minecraft.world.storage.SimpleRegionStorage;
 import net.minecraft.world.storage.VersionedChunkStorage;
 import net.minecraft.world.storage.WorldSaveStorage;
 import org.jetbrains.annotations.Nullable;
@@ -70,29 +70,35 @@
     */
    private static final String NEW_PREFIX = "new_";
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_itsyqabx Lnet/minecraft/unmapped/C_jzcarjio;f_itsyqabx:Lnet/minecraft/unmapped/C_npqneive;}
+    * @mapping {@literal named UPGRADING_POI Lnet/minecraft/world/updater/WorldUpdater;UPGRADING_POI:Lnet/minecraft/text/MutableText;}
     */
-   static final MutableText f_itsyqabx = Text.translatable("optimizeWorld.stage.upgrading.poi");
+   static final MutableText UPGRADING_POI = Text.translatable("optimizeWorld.stage.upgrading.poi");
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_ndykkudb Lnet/minecraft/unmapped/C_jzcarjio;f_ndykkudb:Lnet/minecraft/unmapped/C_npqneive;}
+    * @mapping {@literal named FINISHED_POI Lnet/minecraft/world/updater/WorldUpdater;FINISHED_POI:Lnet/minecraft/text/MutableText;}
     */
-   static final MutableText f_ndykkudb = Text.translatable("optimizeWorld.stage.finished.poi");
+   static final MutableText FINISHED_POI = Text.translatable("optimizeWorld.stage.finished.poi");
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_hsjzkecg Lnet/minecraft/unmapped/C_jzcarjio;f_hsjzkecg:Lnet/minecraft/unmapped/C_npqneive;}
+    * @mapping {@literal named UPGRADING_ENTITIES Lnet/minecraft/world/updater/WorldUpdater;UPGRADING_ENTITIES:Lnet/minecraft/text/MutableText;}
     */
-   static final MutableText f_hsjzkecg = Text.translatable("optimizeWorld.stage.upgrading.entities");
+   static final MutableText UPGRADING_ENTITIES = Text.translatable("optimizeWorld.stage.upgrading.entities");
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_waxkuxwz Lnet/minecraft/unmapped/C_jzcarjio;f_waxkuxwz:Lnet/minecraft/unmapped/C_npqneive;}
+    * @mapping {@literal named FINISHED_ENTITIES Lnet/minecraft/world/updater/WorldUpdater;FINISHED_ENTITIES:Lnet/minecraft/text/MutableText;}
     */
-   static final MutableText f_waxkuxwz = Text.translatable("optimizeWorld.stage.finished.entities");
+   static final MutableText FINISHED_ENTITIES = Text.translatable("optimizeWorld.stage.finished.entities");
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_zgbdxxsa Lnet/minecraft/unmapped/C_jzcarjio;f_zgbdxxsa:Lnet/minecraft/unmapped/C_npqneive;}
+    * @mapping {@literal named UPGRADING_CHUNKS Lnet/minecraft/world/updater/WorldUpdater;UPGRADING_CHUNKS:Lnet/minecraft/text/MutableText;}
     */
-   static final MutableText f_zgbdxxsa = Text.translatable("optimizeWorld.stage.upgrading.chunks");
+   static final MutableText UPGRADING_CHUNKS = Text.translatable("optimizeWorld.stage.upgrading.chunks");
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_gibhqwaa Lnet/minecraft/unmapped/C_jzcarjio;f_gibhqwaa:Lnet/minecraft/unmapped/C_npqneive;}
+    * @mapping {@literal named FINISHED_CHUNKS Lnet/minecraft/world/updater/WorldUpdater;FINISHED_CHUNKS:Lnet/minecraft/text/MutableText;}
     */
-   static final MutableText f_gibhqwaa = Text.translatable("optimizeWorld.stage.finished.chunks");
+   static final MutableText FINISHED_CHUNKS = Text.translatable("optimizeWorld.stage.finished.chunks");
    /**
     * @mapping {@literal hashed f_nnezkpjj Lnet/minecraft/unmapped/C_jzcarjio;f_nnezkpjj:Lnet/minecraft/unmapped/C_tqxyjqsk;}
     * @mapping {@literal named registry Lnet/minecraft/world/updater/WorldUpdater;registry:Lnet/minecraft/registry/Registry;}
@@ -109,9 +115,10 @@
     */
    final boolean eraseCache;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_cpslsylz Lnet/minecraft/unmapped/C_jzcarjio;f_cpslsylz:Z}
+    * @mapping {@literal named recreateRegionFiles Lnet/minecraft/world/updater/WorldUpdater;recreateRegionFiles:Z}
     */
-   final boolean f_cpslsylz;
+   final boolean recreateRegionFiles;
    /**
     * @mapping {@literal hashed f_qmjqucjz Lnet/minecraft/unmapped/C_jzcarjio;f_qmjqucjz:Lnet/minecraft/unmapped/C_bpwagnit$C_unecclfw;}
     * @mapping {@literal named session Lnet/minecraft/world/updater/WorldUpdater;session:Lnet/minecraft/world/storage/WorldSaveStorage$Session;}
@@ -148,9 +155,10 @@
     */
    volatile int totalChunkCount;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_ibejvsgl Lnet/minecraft/unmapped/C_jzcarjio;f_ibejvsgl:I}
+    * @mapping {@literal named totalRegionCount Lnet/minecraft/world/updater/WorldUpdater;totalRegionCount:I}
     */
-   volatile int f_ibejvsgl;
+   volatile int totalRegionCount;
    /**
     * @mapping {@literal hashed f_aqzmpnqd Lnet/minecraft/unmapped/C_jzcarjio;f_aqzmpnqd:I}
     * @mapping {@literal named upgradedChunkCount Lnet/minecraft/world/updater/WorldUpdater;upgradedChunkCount:I}
@@ -186,7 +194,9 @@
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_jzcarjio;<init>(Lnet/minecraft/unmapped/C_bpwagnit$C_unecclfw;Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/unmapped/C_wqxmvzdq;ZZ)V}
     * @mapping {@literal named <init> Lnet/minecraft/world/updater/WorldUpdater;<init>(Lnet/minecraft/world/storage/WorldSaveStorage$Session;Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/registry/DynamicRegistryManager;ZZ)V}
     */
-   public WorldUpdater(WorldSaveStorage.Session session, DataFixer dataFixer, DynamicRegistryManager registryManager, boolean eraseCache, boolean bl2) {
+   public WorldUpdater(
+      WorldSaveStorage.Session session, DataFixer dataFixer, DynamicRegistryManager registryManager, boolean eraseCache, boolean recreateRegionFiles
+   ) {
       this.registry = registryManager.get(RegistryKeys.DIMENSION);
       this.worlds = (Set<RegistryKey<World>>)this.registry.getKeys().stream().map(RegistryKeys::asWorldKey).collect(Collectors.toUnmodifiableSet());
       this.eraseCache = eraseCache;
@@ -195,7 +205,7 @@
       this.persistentStateManager = new PersistentStateManager(
          this.session.getWorldDirectory(World.OVERWORLD).resolve("data").toFile(), dataFixer, registryManager
       );
-      this.f_cpslsylz = bl2;
+      this.recreateRegionFiles = recreateRegionFiles;
       this.updateThread = UPDATE_THREAD_FACTORY.newThread(this::updateWorld);
       this.updateThread.setUncaughtExceptionHandler((thread, throwable) -> {
          LOGGER.error("Error upgrading world", throwable);
@@ -225,11 +235,11 @@
    private void updateWorld() {
       long l = Util.getMeasuringTimeMs();
       LOGGER.info("Upgrading entities");
-      new WorldUpdater.C_uqvgiflx().m_fldimjwd();
+      new WorldUpdater.EntityUpdater().update();
       LOGGER.info("Upgrading POIs");
-      new WorldUpdater.C_ygtlkebu().m_fldimjwd();
+      new WorldUpdater.PoiUpdater().update();
       LOGGER.info("Upgrading blocks");
-      new WorldUpdater.C_nzimilha().m_fldimjwd();
+      new WorldUpdater.ChunkUpdater().update();
       this.persistentStateManager.save();
       l = Util.getMeasuringTimeMs() - l;
       LOGGER.info("World optimizaton finished after {} seconds", l / 1000L);
@@ -301,147 +311,96 @@
    }
 
    /**
-    * Mapping not found
-    */
-   static Path m_qltezbme(Path path) {
-      return path.resolveSibling("new_" + path.getFileName().toString());
-   }
-
-   /**
-    * @mapping {@literal hashed net/minecraft/unmapped/C_jzcarjio$C_adeqquth}
-    * @mapping {@literal named net/minecraft/world/updater/WorldUpdater$C_adeqquth}
-    */
-   abstract class C_adeqquth extends WorldUpdater.C_itdvsyqy<C_gwzzviyw> {
-      /**
-       * Mapping not found
-       */
-      C_adeqquth(DataFixTypes arg2, String string, MutableText arg3, MutableText arg4) {
-         super(arg2, string, string, arg3, arg4);
-      }
-
-      /**
-       * @mapping {@literal hashed m_fqdxcpbl Lnet/minecraft/unmapped/C_jzcarjio$C_adeqquth;m_fqdxcpbl(Lnet/minecraft/unmapped/C_tzvgbkzf;Ljava/nio/file/Path;)Lnet/minecraft/unmapped/C_gwzzviyw;}
-       * @mapping {@literal named m_fqdxcpbl Lnet/minecraft/world/updater/WorldUpdater$C_adeqquth;m_fqdxcpbl(Lnet/minecraft/unmapped/C_tzvgbkzf;Ljava/nio/file/Path;)Lnet/minecraft/unmapped/C_gwzzviyw;}
-       */
-      protected C_gwzzviyw m_fqdxcpbl(C_tzvgbkzf arg, Path path) {
-         return (C_gwzzviyw)(WorldUpdater.this.f_cpslsylz
-            ? new C_uukidwhx(
-               arg.m_ggekeuuv("source"), path, arg.m_ggekeuuv("target"), WorldUpdater.m_qltezbme(path), WorldUpdater.this.dataFixer, true, this.f_vywiwhgs
-            )
-            : new C_gwzzviyw(arg, path, WorldUpdater.this.dataFixer, true, this.f_vywiwhgs));
-      }
-
-      /**
-       * @mapping {@literal hashed m_lpbmembn Lnet/minecraft/unmapped/C_jzcarjio$C_adeqquth;m_lpbmembn(Lnet/minecraft/unmapped/C_gwzzviyw;Lnet/minecraft/unmapped/C_ynrszrtu;Lnet/minecraft/unmapped/C_xhhleach;)Z}
-       * @mapping {@literal named m_rqoeibmv Lnet/minecraft/world/updater/WorldUpdater$C_adeqquth;m_rqoeibmv(Lnet/minecraft/unmapped/C_gwzzviyw;Lnet/minecraft/util/math/ChunkPos;Lnet/minecraft/registry/RegistryKey;)Z}
-       */
-      protected boolean m_rqoeibmv(C_gwzzviyw arg, ChunkPos arg2, RegistryKey<World> registryKey) {
-         NbtCompound lv = (NbtCompound)((Optional)arg.m_mdpwegbt(arg2).join()).orElse(null);
-         if (lv != null) {
-            int i = VersionedChunkStorage.getDataVersion(lv);
-            NbtCompound lv2 = this.m_uduopfej(arg, lv);
-            boolean bl = i < SharedConstants.getGameVersion().getWorldVersionData().getDataVersion();
-            if (bl || WorldUpdater.this.f_cpslsylz) {
-               if (this.f_htrsqjeu != null) {
-                  this.f_htrsqjeu.join();
-               }
-
-               this.f_htrsqjeu = arg.m_befxtenr(arg2, lv2);
-               return true;
-            }
-         }
-
-         return false;
-      }
-
-      /**
-       * Mapping not found
+    * @mapping {@literal hashed m_qltezbme Lnet/minecraft/unmapped/C_jzcarjio;m_qltezbme(Ljava/nio/file/Path;)Ljava/nio/file/Path;}
+    * @mapping {@literal named resolveRecreationDirectory Lnet/minecraft/world/updater/WorldUpdater;resolveRecreationDirectory(Ljava/nio/file/Path;)Ljava/nio/file/Path;}
        */
-      protected abstract NbtCompound m_uduopfej(C_gwzzviyw arg, NbtCompound arg2);
-   }
-
-   /**
-    * @mapping {@literal hashed net/minecraft/unmapped/C_jzcarjio$C_glywgfig}
-    * @mapping {@literal named net/minecraft/world/updater/WorldUpdater$C_glywgfig}
-    */
-   static record C_glywgfig<T>(RegistryKey<World> dimensionKey, T storage, ListIterator<WorldUpdater.C_kxqvuzjo> files) {
+   static Path resolveRecreationDirectory(Path current) {
+      return current.resolveSibling("new_" + current.getFileName().toString());
    }
 
    /**
     * @mapping {@literal hashed net/minecraft/unmapped/C_jzcarjio$C_itdvsyqy}
-    * @mapping {@literal named net/minecraft/world/updater/WorldUpdater$C_itdvsyqy}
+    * @mapping {@literal named net/minecraft/world/updater/WorldUpdater$AbstractUpdater}
     */
-   abstract class C_itdvsyqy<T extends AutoCloseable> {
+   abstract class AbstractUpdater<T extends AutoCloseable> {
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_sfsmkgpy Lnet/minecraft/unmapped/C_jzcarjio$C_itdvsyqy;f_sfsmkgpy:Lnet/minecraft/unmapped/C_npqneive;}
+       * @mapping {@literal named upgradingStatus Lnet/minecraft/world/updater/WorldUpdater$AbstractUpdater;upgradingStatus:Lnet/minecraft/text/MutableText;}
        */
-      private final MutableText f_sfsmkgpy;
+      private final MutableText upgradingStatus;
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_rkcvpmgz Lnet/minecraft/unmapped/C_jzcarjio$C_itdvsyqy;f_rkcvpmgz:Lnet/minecraft/unmapped/C_npqneive;}
+       * @mapping {@literal named finishedStatus Lnet/minecraft/world/updater/WorldUpdater$AbstractUpdater;finishedStatus:Lnet/minecraft/text/MutableText;}
        */
-      private final MutableText f_rkcvpmgz;
+      private final MutableText finishedStatus;
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_tfptrfsf Lnet/minecraft/unmapped/C_jzcarjio$C_itdvsyqy;f_tfptrfsf:Ljava/lang/String;}
+       * @mapping {@literal named type Lnet/minecraft/world/updater/WorldUpdater$AbstractUpdater;type:Ljava/lang/String;}
        */
-      private final String f_tfptrfsf;
+      private final String type;
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_ixicfbbl Lnet/minecraft/unmapped/C_jzcarjio$C_itdvsyqy;f_ixicfbbl:Ljava/lang/String;}
+       * @mapping {@literal named targetName Lnet/minecraft/world/updater/WorldUpdater$AbstractUpdater;targetName:Ljava/lang/String;}
        */
-      private final String f_ixicfbbl;
+      private final String targetName;
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_htrsqjeu Lnet/minecraft/unmapped/C_jzcarjio$C_itdvsyqy;f_htrsqjeu:Ljava/util/concurrent/CompletableFuture;}
+       * @mapping {@literal named previousWriteFuture Lnet/minecraft/world/updater/WorldUpdater$AbstractUpdater;previousWriteFuture:Ljava/util/concurrent/CompletableFuture;}
        */
       @Nullable
-      protected CompletableFuture<Void> f_htrsqjeu;
+      protected CompletableFuture<Void> previousWriteFuture;
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_vywiwhgs Lnet/minecraft/unmapped/C_jzcarjio$C_itdvsyqy;f_vywiwhgs:Lnet/minecraft/unmapped/C_ccrrfaqj;}
+       * @mapping {@literal named dataFixTypes Lnet/minecraft/world/updater/WorldUpdater$AbstractUpdater;dataFixTypes:Lnet/minecraft/datafixer/DataFixTypes;}
        */
-      protected final DataFixTypes f_vywiwhgs;
+      protected final DataFixTypes dataFixTypes;
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_jzcarjio$C_itdvsyqy;<init>(Lnet/minecraft/unmapped/C_jzcarjio;Lnet/minecraft/unmapped/C_ccrrfaqj;Ljava/lang/String;Ljava/lang/String;Lnet/minecraft/unmapped/C_npqneive;Lnet/minecraft/unmapped/C_npqneive;)V}
+       * @mapping {@literal named <init> Lnet/minecraft/world/updater/WorldUpdater$AbstractUpdater;<init>(Lnet/minecraft/world/updater/WorldUpdater;Lnet/minecraft/datafixer/DataFixTypes;Ljava/lang/String;Ljava/lang/String;Lnet/minecraft/text/MutableText;Lnet/minecraft/text/MutableText;)V}
        */
-      C_itdvsyqy(DataFixTypes arg2, String string, String string2, MutableText arg3, MutableText arg4) {
-         this.f_vywiwhgs = arg2;
-         this.f_tfptrfsf = string;
-         this.f_ixicfbbl = string2;
-         this.f_sfsmkgpy = arg3;
-         this.f_rkcvpmgz = arg4;
+      AbstractUpdater(DataFixTypes dataFixTypes, String type, String targetName, MutableText upgradingStatus, MutableText finishedStatus) {
+         this.dataFixTypes = dataFixTypes;
+         this.type = type;
+         this.targetName = targetName;
+         this.upgradingStatus = upgradingStatus;
+         this.finishedStatus = finishedStatus;
       }
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed m_fldimjwd Lnet/minecraft/unmapped/C_jzcarjio$C_itdvsyqy;m_fldimjwd()V}
+       * @mapping {@literal named update Lnet/minecraft/world/updater/WorldUpdater$AbstractUpdater;update()V}
        */
-      public void m_fldimjwd() {
-         WorldUpdater.this.f_ibejvsgl = 0;
+      public void update() {
+         WorldUpdater.this.totalRegionCount = 0;
          WorldUpdater.this.totalChunkCount = 0;
          WorldUpdater.this.upgradedChunkCount = 0;
          WorldUpdater.this.skippedChunkCount = 0;
-         List<WorldUpdater.C_glywgfig<T>> list = this.m_tkgcolez();
+         List<WorldUpdater.DimensionData<T>> list = this.getDimensionsToUpdate();
          if (WorldUpdater.this.totalChunkCount != 0) {
-            float f = (float)WorldUpdater.this.f_ibejvsgl;
-            WorldUpdater.this.status = this.f_sfsmkgpy;
+            float f = (float)WorldUpdater.this.totalRegionCount;
+            WorldUpdater.this.status = this.upgradingStatus;
 
             while (WorldUpdater.this.keepUpgradingChunks) {
                boolean bl = false;
                float g = 0.0F;
 
-               for (WorldUpdater.C_glywgfig<T> lv : list) {
+               for (WorldUpdater.DimensionData<T> lv : list) {
                   RegistryKey<World> lv2 = lv.dimensionKey;
-                  ListIterator<WorldUpdater.C_kxqvuzjo> listIterator = lv.files;
+                  ListIterator<WorldUpdater.Region> listIterator = lv.files;
                   T autoCloseable = lv.storage;
                   if (listIterator.hasNext()) {
-                     WorldUpdater.C_kxqvuzjo lv3 = (WorldUpdater.C_kxqvuzjo)listIterator.next();
+                     WorldUpdater.Region lv3 = (WorldUpdater.Region)listIterator.next();
                      boolean bl2 = true;
 
                      for (ChunkPos lv4 : lv3.chunksToUpgrade) {
-                        bl2 = bl2 && this.m_lhqivwal(lv2, autoCloseable, lv4);
+                        bl2 = bl2 && this.update(lv2, autoCloseable, lv4);
                         bl = true;
                      }
 
-                     if (WorldUpdater.this.f_cpslsylz) {
+                     if (WorldUpdater.this.recreateRegionFiles) {
                         if (bl2) {
-                           this.m_fyokhipm(lv3.file);
+                           this.recreate(lv3.file);
                         } else {
                            WorldUpdater.LOGGER.error("Failed to convert region file {}", lv3.file.m_inxcvyaw());
                         }
@@ -459,9 +418,9 @@
                }
             }
 
-            WorldUpdater.this.status = this.f_rkcvpmgz;
+            WorldUpdater.this.status = this.finishedStatus;
 
-            for (WorldUpdater.C_glywgfig<T> lv5 : list) {
+            for (WorldUpdater.DimensionData<T> lv5 : list) {
                try {
                   lv5.storage.close();
                } catch (Exception var14) {
@@ -472,46 +431,50 @@
       }
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed m_tkgcolez Lnet/minecraft/unmapped/C_jzcarjio$C_itdvsyqy;m_tkgcolez()Ljava/util/List;}
+       * @mapping {@literal named getDimensionsToUpdate Lnet/minecraft/world/updater/WorldUpdater$AbstractUpdater;getDimensionsToUpdate()Ljava/util/List;}
        */
-      private List<WorldUpdater.C_glywgfig<T>> m_tkgcolez() {
-         List<WorldUpdater.C_glywgfig<T>> list = Lists.<WorldUpdater.C_glywgfig<T>>newArrayList();
+      private List<WorldUpdater.DimensionData<T>> getDimensionsToUpdate() {
+         List<WorldUpdater.DimensionData<T>> list = Lists.<WorldUpdater.DimensionData<T>>newArrayList();
 
          for (RegistryKey<World> lv : WorldUpdater.this.worlds) {
-            C_tzvgbkzf lv2 = new C_tzvgbkzf(WorldUpdater.this.session.getDirectoryName(), lv, this.f_tfptrfsf);
-            Path path = WorldUpdater.this.session.getWorldDirectory(lv).resolve(this.f_ixicfbbl);
-            T autoCloseable = this.m_fqdxcpbl(lv2, path);
-            ListIterator<WorldUpdater.C_kxqvuzjo> listIterator = this.m_dzhhhzbp(lv2, path);
-            list.add(new WorldUpdater.C_glywgfig(lv, autoCloseable, listIterator));
+            RegionStorageKey lv2 = new RegionStorageKey(WorldUpdater.this.session.getDirectoryName(), lv, this.type);
+            Path path = WorldUpdater.this.session.getWorldDirectory(lv).resolve(this.targetName);
+            T autoCloseable = this.createStorage(lv2, path);
+            ListIterator<WorldUpdater.Region> listIterator = this.getRegionsToProcess(lv2, path);
+            list.add(new WorldUpdater.DimensionData(lv, autoCloseable, listIterator));
          }
 
          return list;
       }
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed m_fqdxcpbl Lnet/minecraft/unmapped/C_jzcarjio$C_itdvsyqy;m_fqdxcpbl(Lnet/minecraft/unmapped/C_tzvgbkzf;Ljava/nio/file/Path;)Ljava/lang/AutoCloseable;}
+       * @mapping {@literal named createStorage Lnet/minecraft/world/updater/WorldUpdater$AbstractUpdater;createStorage(Lnet/minecraft/world/storage/RegionStorageKey;Ljava/nio/file/Path;)Ljava/lang/AutoCloseable;}
        */
-      protected abstract T m_fqdxcpbl(C_tzvgbkzf arg, Path path);
+      protected abstract T createStorage(RegionStorageKey key, Path worldDirectory);
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed m_dzhhhzbp Lnet/minecraft/unmapped/C_jzcarjio$C_itdvsyqy;m_dzhhhzbp(Lnet/minecraft/unmapped/C_tzvgbkzf;Ljava/nio/file/Path;)Ljava/util/ListIterator;}
+       * @mapping {@literal named getRegionsToProcess Lnet/minecraft/world/updater/WorldUpdater$AbstractUpdater;getRegionsToProcess(Lnet/minecraft/world/storage/RegionStorageKey;Ljava/nio/file/Path;)Ljava/util/ListIterator;}
        */
-      private ListIterator<WorldUpdater.C_kxqvuzjo> m_dzhhhzbp(C_tzvgbkzf arg, Path path) {
-         List<WorldUpdater.C_kxqvuzjo> list = m_lqesvzkq(arg, path);
-         WorldUpdater.this.f_ibejvsgl = WorldUpdater.this.f_ibejvsgl + list.size();
-         WorldUpdater.this.totalChunkCount = WorldUpdater.this.totalChunkCount + list.stream().mapToInt(argx -> argx.chunksToUpgrade.size()).sum();
+      private ListIterator<WorldUpdater.Region> getRegionsToProcess(RegionStorageKey key, Path regionDirectory) {
+         List<WorldUpdater.Region> list = getChunkPositions(key, regionDirectory);
+         WorldUpdater.this.totalRegionCount = WorldUpdater.this.totalRegionCount + list.size();
+         WorldUpdater.this.totalChunkCount = WorldUpdater.this.totalChunkCount + list.stream().mapToInt(arg -> arg.chunksToUpgrade.size()).sum();
          return list.listIterator();
       }
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed m_lqesvzkq Lnet/minecraft/unmapped/C_jzcarjio$C_itdvsyqy;m_lqesvzkq(Lnet/minecraft/unmapped/C_tzvgbkzf;Ljava/nio/file/Path;)Ljava/util/List;}
+       * @mapping {@literal named getChunkPositions Lnet/minecraft/world/updater/WorldUpdater$AbstractUpdater;getChunkPositions(Lnet/minecraft/world/storage/RegionStorageKey;Ljava/nio/file/Path;)Ljava/util/List;}
        */
-      private static List<WorldUpdater.C_kxqvuzjo> m_lqesvzkq(C_tzvgbkzf arg, Path path) {
-         File[] files = path.toFile().listFiles((filex, string) -> string.endsWith(".mca"));
+      private static List<WorldUpdater.Region> getChunkPositions(RegionStorageKey key, Path regionDirectory) {
+         File[] files = regionDirectory.toFile().listFiles((filex, string) -> string.endsWith(".mca"));
          if (files == null) {
             return List.of();
          } else {
-            List<WorldUpdater.C_kxqvuzjo> list = Lists.<WorldUpdater.C_kxqvuzjo>newArrayList();
+            List<WorldUpdater.Region> list = Lists.<WorldUpdater.Region>newArrayList();
 
             for (File file : files) {
                Matcher matcher = WorldUpdater.REGION_FILE_PATTERN.matcher(file.getName());
@@ -520,7 +483,7 @@
                   int j = Integer.parseInt(matcher.group(2)) << 5;
                   List<ChunkPos> list2 = Lists.<ChunkPos>newArrayList();
 
-                  try (RegionFile lv = new RegionFile(arg, file.toPath(), path, true)) {
+                  try (RegionFile lv = new RegionFile(key, file.toPath(), regionDirectory, true)) {
                      for (int k = 0; k < 32; k++) {
                         for (int l = 0; l < 32; l++) {
                            ChunkPos lv2 = new ChunkPos(k + i, l + j);
@@ -531,7 +494,7 @@
                      }
 
                      if (!list2.isEmpty()) {
-                        list.add(new WorldUpdater.C_kxqvuzjo(lv, list2));
+                        list.add(new WorldUpdater.Region(lv, list2));
                      }
                   } catch (Throwable var18) {
                      WorldUpdater.LOGGER.error("Failed to read chunks from region file {}", file.toPath(), var18);
@@ -545,20 +508,20 @@
 
       /**
        * @mapping {@literal hashed m_lhqivwal Lnet/minecraft/unmapped/C_jzcarjio$C_itdvsyqy;m_lhqivwal(Lnet/minecraft/unmapped/C_xhhleach;Ljava/lang/AutoCloseable;Lnet/minecraft/unmapped/C_ynrszrtu;)Z}
-       * @mapping {@literal named m_lhqivwal Lnet/minecraft/world/updater/WorldUpdater$C_itdvsyqy;m_lhqivwal(Lnet/minecraft/registry/RegistryKey;Ljava/lang/AutoCloseable;Lnet/minecraft/util/math/ChunkPos;)Z}
+       * @mapping {@literal named update Lnet/minecraft/world/updater/WorldUpdater$AbstractUpdater;update(Lnet/minecraft/registry/RegistryKey;Ljava/lang/AutoCloseable;Lnet/minecraft/util/math/ChunkPos;)Z}
        */
-      private boolean m_lhqivwal(RegistryKey<World> registryKey, T autoCloseable, ChunkPos arg2) {
+      private boolean update(RegistryKey<World> worldKey, T storage, ChunkPos pos) {
          boolean bl = false;
 
          try {
-            bl = this.m_rqoeibmv(autoCloseable, arg2, registryKey);
+            bl = this.tryUpdate(storage, pos, worldKey);
          } catch (CompletionException | CrashException var7) {
             Throwable throwable = var7.getCause();
             if (!(throwable instanceof IOException)) {
                throw var7;
             }
 
-            WorldUpdater.LOGGER.error("Error upgrading chunk {}", arg2, throwable);
+            WorldUpdater.LOGGER.error("Error upgrading chunk {}", pos, throwable);
          }
 
          if (bl) {
@@ -572,22 +535,23 @@
 
       /**
        * @mapping {@literal hashed m_rqoeibmv Lnet/minecraft/unmapped/C_jzcarjio$C_itdvsyqy;m_rqoeibmv(Ljava/lang/AutoCloseable;Lnet/minecraft/unmapped/C_ynrszrtu;Lnet/minecraft/unmapped/C_xhhleach;)Z}
-       * @mapping {@literal named m_rqoeibmv Lnet/minecraft/world/updater/WorldUpdater$C_itdvsyqy;m_rqoeibmv(Ljava/lang/AutoCloseable;Lnet/minecraft/util/math/ChunkPos;Lnet/minecraft/registry/RegistryKey;)Z}
+       * @mapping {@literal named tryUpdate Lnet/minecraft/world/updater/WorldUpdater$AbstractUpdater;tryUpdate(Ljava/lang/AutoCloseable;Lnet/minecraft/util/math/ChunkPos;Lnet/minecraft/registry/RegistryKey;)Z}
        */
-      protected abstract boolean m_rqoeibmv(T autoCloseable, ChunkPos arg, RegistryKey<World> registryKey);
+      protected abstract boolean tryUpdate(T storage, ChunkPos pos, RegistryKey<World> worldKey);
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed m_fyokhipm Lnet/minecraft/unmapped/C_jzcarjio$C_itdvsyqy;m_fyokhipm(Lnet/minecraft/unmapped/C_kykyawqb;)V}
+       * @mapping {@literal named recreate Lnet/minecraft/world/updater/WorldUpdater$AbstractUpdater;recreate(Lnet/minecraft/world/storage/RegionFile;)V}
        */
-      private void m_fyokhipm(RegionFile arg) {
-         if (WorldUpdater.this.f_cpslsylz) {
-            if (this.f_htrsqjeu != null) {
-               this.f_htrsqjeu.join();
+      private void recreate(RegionFile file) {
+         if (WorldUpdater.this.recreateRegionFiles) {
+            if (this.previousWriteFuture != null) {
+               this.previousWriteFuture.join();
             }
 
-            Path path = arg.m_inxcvyaw();
+            Path path = file.m_inxcvyaw();
             Path path2 = path.getParent();
-            Path path3 = WorldUpdater.m_qltezbme(path2).resolve(path.getFileName().toString());
+            Path path3 = WorldUpdater.resolveRecreationDirectory(path2).resolve(path.getFileName().toString());
 
             try {
                if (path3.toFile().exists()) {
@@ -604,29 +568,22 @@
    }
 
    /**
-    * @mapping {@literal hashed net/minecraft/unmapped/C_jzcarjio$C_kxqvuzjo}
-    * @mapping {@literal named net/minecraft/world/updater/WorldUpdater$C_kxqvuzjo}
-    */
-   static record C_kxqvuzjo(RegionFile file, List<ChunkPos> chunksToUpgrade) {
-   }
-
-   /**
     * @mapping {@literal hashed net/minecraft/unmapped/C_jzcarjio$C_nzimilha}
-    * @mapping {@literal named net/minecraft/world/updater/WorldUpdater$C_nzimilha}
+    * @mapping {@literal named net/minecraft/world/updater/WorldUpdater$ChunkUpdater}
     */
-   class C_nzimilha extends WorldUpdater.C_itdvsyqy<VersionedChunkStorage> {
+   class ChunkUpdater extends WorldUpdater.AbstractUpdater<VersionedChunkStorage> {
       /**
        * Mapping not found
        */
-      C_nzimilha() {
-         super(DataFixTypes.CHUNK, "chunk", "region", WorldUpdater.f_zgbdxxsa, WorldUpdater.f_gibhqwaa);
+      ChunkUpdater() {
+         super(DataFixTypes.CHUNK, "chunk", "region", WorldUpdater.UPGRADING_CHUNKS, WorldUpdater.FINISHED_CHUNKS);
       }
 
       /**
        * @mapping {@literal hashed m_hbxpqvcp Lnet/minecraft/unmapped/C_jzcarjio$C_nzimilha;m_hbxpqvcp(Lnet/minecraft/unmapped/C_hzmyuskp;Lnet/minecraft/unmapped/C_ynrszrtu;Lnet/minecraft/unmapped/C_xhhleach;)Z}
-       * @mapping {@literal named m_rqoeibmv Lnet/minecraft/world/updater/WorldUpdater$C_nzimilha;m_rqoeibmv(Lnet/minecraft/world/storage/VersionedChunkStorage;Lnet/minecraft/util/math/ChunkPos;Lnet/minecraft/registry/RegistryKey;)Z}
+       * @mapping {@literal named tryUpdate Lnet/minecraft/world/updater/WorldUpdater$ChunkUpdater;tryUpdate(Lnet/minecraft/world/storage/VersionedChunkStorage;Lnet/minecraft/util/math/ChunkPos;Lnet/minecraft/registry/RegistryKey;)Z}
        */
-      protected boolean m_rqoeibmv(VersionedChunkStorage arg, ChunkPos arg2, RegistryKey<World> registryKey) {
+      protected boolean tryUpdate(VersionedChunkStorage arg, ChunkPos arg2, RegistryKey<World> registryKey) {
          NbtCompound lv = (NbtCompound)((Optional)arg.getNbt(arg2).join()).orElse(null);
          if (lv != null) {
             int i = VersionedChunkStorage.getDataVersion(lv);
@@ -654,12 +611,12 @@
                }
             }
 
-            if (bl || WorldUpdater.this.f_cpslsylz) {
-               if (this.f_htrsqjeu != null) {
-                  this.f_htrsqjeu.join();
+            if (bl || WorldUpdater.this.recreateRegionFiles) {
+               if (this.previousWriteFuture != null) {
+                  this.previousWriteFuture.join();
                }
 
-               this.f_htrsqjeu = arg.setNbt(arg2, lv3);
+               this.previousWriteFuture = arg.setNbt(arg2, lv3);
                return true;
             }
          }
@@ -669,54 +626,136 @@
 
       /**
        * @mapping {@literal hashed m_adskmtmc Lnet/minecraft/unmapped/C_jzcarjio$C_nzimilha;m_adskmtmc(Lnet/minecraft/unmapped/C_tzvgbkzf;Ljava/nio/file/Path;)Lnet/minecraft/unmapped/C_hzmyuskp;}
-       * @mapping {@literal named m_fqdxcpbl Lnet/minecraft/world/updater/WorldUpdater$C_nzimilha;m_fqdxcpbl(Lnet/minecraft/unmapped/C_tzvgbkzf;Ljava/nio/file/Path;)Lnet/minecraft/world/storage/VersionedChunkStorage;}
+       * @mapping {@literal named createStorage Lnet/minecraft/world/updater/WorldUpdater$ChunkUpdater;createStorage(Lnet/minecraft/world/storage/RegionStorageKey;Ljava/nio/file/Path;)Lnet/minecraft/world/storage/VersionedChunkStorage;}
        */
-      protected VersionedChunkStorage m_fqdxcpbl(C_tzvgbkzf arg, Path path) {
-         return (VersionedChunkStorage)(WorldUpdater.this.f_cpslsylz
-            ? new C_qchnagao(arg.m_ggekeuuv("source"), path, arg.m_ggekeuuv("target"), WorldUpdater.m_qltezbme(path), WorldUpdater.this.dataFixer, true)
+      protected VersionedChunkStorage createStorage(RegionStorageKey arg, Path path) {
+         return (VersionedChunkStorage)(WorldUpdater.this.recreateRegionFiles
+            ? new RecreatedChunkStorage(
+               arg.withTypeSuffix("source"),
+               path,
+               arg.withTypeSuffix("target"),
+               WorldUpdater.resolveRecreationDirectory(path),
+               WorldUpdater.this.dataFixer,
+               true
+            )
             : new VersionedChunkStorage(arg, path, WorldUpdater.this.dataFixer, true));
       }
    }
 
    /**
+    * @mapping {@literal hashed net/minecraft/unmapped/C_jzcarjio$C_glywgfig}
+    * @mapping {@literal named net/minecraft/world/updater/WorldUpdater$DimensionData}
+    */
+   static record DimensionData<T>(RegistryKey<World> dimensionKey, T storage, ListIterator<WorldUpdater.Region> files) {
+   }
+
+   /**
     * @mapping {@literal hashed net/minecraft/unmapped/C_jzcarjio$C_uqvgiflx}
-    * @mapping {@literal named net/minecraft/world/updater/WorldUpdater$C_uqvgiflx}
+    * @mapping {@literal named net/minecraft/world/updater/WorldUpdater$EntityUpdater}
     */
-   class C_uqvgiflx extends WorldUpdater.C_adeqquth {
+   class EntityUpdater extends WorldUpdater.SimpleRegionStorageUpdater {
       /**
        * Mapping not found
        */
-      C_uqvgiflx() {
-         super(DataFixTypes.ENTITY_CHUNK, "entities", WorldUpdater.f_hsjzkecg, WorldUpdater.f_waxkuxwz);
+      EntityUpdater() {
+         super(DataFixTypes.ENTITY_CHUNK, "entities", WorldUpdater.UPGRADING_ENTITIES, WorldUpdater.FINISHED_ENTITIES);
       }
 
       /**
        * Mapping not found
        */
       @Override
-      protected NbtCompound m_uduopfej(C_gwzzviyw arg, NbtCompound arg2) {
-         return arg.m_nahuhtnn(arg2, -1);
+      protected NbtCompound updateNbt(SimpleRegionStorage storage, NbtCompound nbt) {
+         return storage.update(nbt, -1);
       }
    }
 
    /**
     * @mapping {@literal hashed net/minecraft/unmapped/C_jzcarjio$C_ygtlkebu}
-    * @mapping {@literal named net/minecraft/world/updater/WorldUpdater$C_ygtlkebu}
+    * @mapping {@literal named net/minecraft/world/updater/WorldUpdater$PoiUpdater}
     */
-   class C_ygtlkebu extends WorldUpdater.C_adeqquth {
+   class PoiUpdater extends WorldUpdater.SimpleRegionStorageUpdater {
       /**
        * Mapping not found
        */
-      C_ygtlkebu() {
-         super(DataFixTypes.POI_CHUNK, "poi", WorldUpdater.f_itsyqabx, WorldUpdater.f_ndykkudb);
+      PoiUpdater() {
+         super(DataFixTypes.POI_CHUNK, "poi", WorldUpdater.UPGRADING_POI, WorldUpdater.FINISHED_POI);
       }
 
       /**
        * Mapping not found
        */
       @Override
-      protected NbtCompound m_uduopfej(C_gwzzviyw arg, NbtCompound arg2) {
-         return arg.m_nahuhtnn(arg2, 1945);
+      protected NbtCompound updateNbt(SimpleRegionStorage storage, NbtCompound nbt) {
+         return storage.update(nbt, 1945);
+      }
       }
+
+   /**
+    * @mapping {@literal hashed net/minecraft/unmapped/C_jzcarjio$C_kxqvuzjo}
+    * @mapping {@literal named net/minecraft/world/updater/WorldUpdater$Region}
+    */
+   static record Region(RegionFile file, List<ChunkPos> chunksToUpgrade) {
+   }
+
+   /**
+    * @mapping {@literal hashed net/minecraft/unmapped/C_jzcarjio$C_adeqquth}
+    * @mapping {@literal named net/minecraft/world/updater/WorldUpdater$SimpleRegionStorageUpdater}
+    */
+   abstract class SimpleRegionStorageUpdater extends WorldUpdater.AbstractUpdater<SimpleRegionStorage> {
+      /**
+       * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_jzcarjio$C_adeqquth;<init>(Lnet/minecraft/unmapped/C_jzcarjio;Lnet/minecraft/unmapped/C_ccrrfaqj;Ljava/lang/String;Lnet/minecraft/unmapped/C_npqneive;Lnet/minecraft/unmapped/C_npqneive;)V}
+       * @mapping {@literal named <init> Lnet/minecraft/world/updater/WorldUpdater$SimpleRegionStorageUpdater;<init>(Lnet/minecraft/world/updater/WorldUpdater;Lnet/minecraft/datafixer/DataFixTypes;Ljava/lang/String;Lnet/minecraft/text/MutableText;Lnet/minecraft/text/MutableText;)V}
+       */
+      SimpleRegionStorageUpdater(DataFixTypes dataFixTypes, String type, MutableText upgradingStatus, MutableText finishedStatus) {
+         super(dataFixTypes, type, type, upgradingStatus, finishedStatus);
+      }
+
+      /**
+       * @mapping {@literal hashed m_tpzukybp Lnet/minecraft/unmapped/C_jzcarjio$C_adeqquth;m_tpzukybp(Lnet/minecraft/unmapped/C_tzvgbkzf;Ljava/nio/file/Path;)Lnet/minecraft/unmapped/C_gwzzviyw;}
+       * @mapping {@literal named createStorage Lnet/minecraft/world/updater/WorldUpdater$SimpleRegionStorageUpdater;createStorage(Lnet/minecraft/world/storage/RegionStorageKey;Ljava/nio/file/Path;)Lnet/minecraft/world/storage/SimpleRegionStorage;}
+       */
+      protected SimpleRegionStorage createStorage(RegionStorageKey arg, Path path) {
+         return (SimpleRegionStorage)(WorldUpdater.this.recreateRegionFiles
+            ? new SimpleRegionRecreationStorage(
+               arg.withTypeSuffix("source"),
+               path,
+               arg.withTypeSuffix("target"),
+               WorldUpdater.resolveRecreationDirectory(path),
+               WorldUpdater.this.dataFixer,
+               true,
+               this.dataFixTypes
+            )
+            : new SimpleRegionStorage(arg, path, WorldUpdater.this.dataFixer, true, this.dataFixTypes));
+      }
+
+      /**
+       * @mapping {@literal hashed m_lpbmembn Lnet/minecraft/unmapped/C_jzcarjio$C_adeqquth;m_lpbmembn(Lnet/minecraft/unmapped/C_gwzzviyw;Lnet/minecraft/unmapped/C_ynrszrtu;Lnet/minecraft/unmapped/C_xhhleach;)Z}
+       * @mapping {@literal named tryUpdate Lnet/minecraft/world/updater/WorldUpdater$SimpleRegionStorageUpdater;tryUpdate(Lnet/minecraft/world/storage/SimpleRegionStorage;Lnet/minecraft/util/math/ChunkPos;Lnet/minecraft/registry/RegistryKey;)Z}
+       */
+      protected boolean tryUpdate(SimpleRegionStorage arg, ChunkPos arg2, RegistryKey<World> registryKey) {
+         NbtCompound lv = (NbtCompound)((Optional)arg.read(arg2).join()).orElse(null);
+         if (lv != null) {
+            int i = VersionedChunkStorage.getDataVersion(lv);
+            NbtCompound lv2 = this.updateNbt(arg, lv);
+            boolean bl = i < SharedConstants.getGameVersion().getWorldVersionData().getDataVersion();
+            if (bl || WorldUpdater.this.recreateRegionFiles) {
+               if (this.previousWriteFuture != null) {
+                  this.previousWriteFuture.join();
+               }
+
+               this.previousWriteFuture = arg.write(arg2, lv2);
+               return true;
+            }
+         }
+
+         return false;
+      }
+
+      /**
+       * @mapping {@literal hashed m_uduopfej Lnet/minecraft/unmapped/C_jzcarjio$C_adeqquth;m_uduopfej(Lnet/minecraft/unmapped/C_gwzzviyw;Lnet/minecraft/unmapped/C_hhlwcnih;)Lnet/minecraft/unmapped/C_hhlwcnih;}
+       * @mapping {@literal named updateNbt Lnet/minecraft/world/updater/WorldUpdater$SimpleRegionStorageUpdater;updateNbt(Lnet/minecraft/world/storage/SimpleRegionStorage;Lnet/minecraft/nbt/NbtCompound;)Lnet/minecraft/nbt/NbtCompound;}
+       */
+      protected abstract NbtCompound updateNbt(SimpleRegionStorage storage, NbtCompound nbt);
    }
 }

Please sign in to comment.