Skip to content

Commit

Permalink
more nonsense
Browse files Browse the repository at this point in the history
  • Loading branch information
@ix0rai
ix0rai committed Apr 2, 2024
1 parent 60570ef commit ee79264
Show file tree
Hide file tree
Showing 8 changed files with 27 additions and 0 deletions.
3 changes: 3 additions & 0 deletions mappings/net/minecraft/world/biome/util/MultiNoiseBiomeSourceParameterList.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ CLASS net/minecraft/unmapped/C_xmtsvelx net/minecraft/world/biome/util/MultiNois
METHOD <init> (Lnet/minecraft/unmapped/C_xmtsvelx$C_jgklgqjr;Lnet/minecraft/unmapped/C_pzdchrcy;)V
ARG 1 preset
ARG 2 biomeProvider
METHOD m_dhdwhiqm getKnownPresets ()Ljava/util/Map;
METHOD m_gfqatzhm (Lnet/minecraft/unmapped/C_xmtsvelx;)Lnet/minecraft/unmapped/C_xmtsvelx$C_jgklgqjr;
ARG 0 list
METHOD m_owbadgbz (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
Expand All @@ -16,3 +17,5 @@ CLASS net/minecraft/unmapped/C_xmtsvelx net/minecraft/world/biome/util/MultiNois
FIELD f_rugrjshd OVERWORLD Lnet/minecraft/unmapped/C_xmtsvelx$C_jgklgqjr;
FIELD f_soykajof id Lnet/minecraft/unmapped/C_ncpywfca;
CLASS C_pttrytil SourceProvider
METHOD apply apply (Ljava/util/function/Function;)Lnet/minecraft/unmapped/C_ohqwadgy$C_ftigwvun;
ARG 1 function
1 change: 1 addition & 0 deletions mappings/net/minecraft/world/storage/EntityChunkDataAccess.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ CLASS net/minecraft/unmapped/C_xyuwhjxc net/minecraft/world/storage/EntityChunkD
FIELD f_lswnhdxi emptyChunks Lit/unimi/dsi/fastutil/longs/LongSet;
FIELD f_mxmmjvju POSITION_KEY Ljava/lang/String;
FIELD f_qovgvewl LOGGER Lorg/slf4j/Logger;
FIELD f_qzlguxdo regionStorage Lnet/minecraft/unmapped/C_gwzzviyw;
FIELD f_tazeglhw taskExecutor Lnet/minecraft/unmapped/C_bhuwdyga;
FIELD f_zzplumpw ENTITIES_KEY Ljava/lang/String;
METHOD m_biicmepr (Lnet/minecraft/unmapped/C_hqhtfwlr;Lnet/minecraft/unmapped/C_astfners;)V
Expand Down
1 change: 1 addition & 0 deletions mappings/net/minecraft/world/storage/ParsedSaveProperties.mapping
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
CLASS net/minecraft/unmapped/C_qhzfxdhh net/minecraft/world/storage/ParsedSaveProperties
4 changes: 4 additions & 0 deletions mappings/net/minecraft/world/storage/RegionFile.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ CLASS net/minecraft/unmapped/C_kykyawqb net/minecraft/world/storage/RegionFile
FIELD f_torejiiv CHUNK_HEADER_SIZE I
FIELD f_uzbltvoa EXTERNAL_STREAM_FLAG I
FIELD f_xggxxmgb outputChunkStreamVersion Lnet/minecraft/unmapped/C_jrihwgqn;
METHOD <init> (Lnet/minecraft/unmapped/C_tzvgbkzf;Ljava/nio/file/Path;Ljava/nio/file/Path;Lnet/minecraft/unmapped/C_jrihwgqn;Z)V
ARG 1 storageKey
METHOD <init> (Lnet/minecraft/unmapped/C_tzvgbkzf;Ljava/nio/file/Path;Ljava/nio/file/Path;Z)V
ARG 1 storageKey
METHOD close close ()V
METHOD m_abzgfeji getSectorData (Lnet/minecraft/unmapped/C_ynrszrtu;)I
ARG 1 pos
Expand Down
6 changes: 6 additions & 0 deletions mappings/net/minecraft/world/storage/SerializingRegionBasedStorage.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ CLASS net/minecraft/unmapped/C_suaauzrg net/minecraft/world/storage/SerializingR
FIELD f_hkdspeev LOGGER Lorg/slf4j/Logger;
FIELD f_lzyscepg unsavedElements Lit/unimi/dsi/fastutil/longs/LongLinkedOpenHashSet;
FIELD f_watghctx world Lnet/minecraft/unmapped/C_qpninoyb;
METHOD <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
ARG 1 regionStorage
METHOD close close ()V
METHOD m_baelplcn loadDataAt (Lnet/minecraft/unmapped/C_ynrszrtu;)V
ARG 1 chunkPos
Expand All @@ -22,6 +24,10 @@ CLASS net/minecraft/unmapped/C_suaauzrg net/minecraft/world/storage/SerializingR
METHOD m_erxlnqps toChunkPosLong (Lnet/minecraft/unmapped/C_ynrszrtu;I)J
ARG 0 pos
ARG 1 y
METHOD m_hosgsbzq readColumn (Lnet/minecraft/unmapped/C_ynrszrtu;Lnet/minecraft/unmapped/C_piadqmzm;Lnet/minecraft/unmapped/C_hhlwcnih;)V
ARG 1 pos
ARG 2 ops
ARG 3 nbt
METHOD m_ikyichfy isPosInvalid (J)Z
ARG 1 pos
METHOD m_iyehricr onLoad (J)V
Expand Down
1 change: 1 addition & 0 deletions mappings/net/minecraft/world/storage/SimpleRegionStorage.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
CLASS net/minecraft/unmapped/C_gwzzviyw net/minecraft/world/storage/SimpleRegionStorage
FIELD f_jnbyowuh dataFixTypes Lnet/minecraft/unmapped/C_ccrrfaqj;
FIELD f_lsdrnlsq dataFixer Lcom/mojang/datafixers/DataFixer;
FIELD f_meesemog worker Lnet/minecraft/unmapped/C_ffgsaknh;
METHOD close close ()V
METHOD m_befxtenr write (Lnet/minecraft/unmapped/C_ynrszrtu;Lnet/minecraft/unmapped/C_hhlwcnih;)Ljava/util/concurrent/CompletableFuture;
Expand Down
1 change: 1 addition & 0 deletions mappings/net/minecraft/world/storage/WorldSaveStorage.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
CLASS net/minecraft/unmapped/C_bpwagnit net/minecraft/world/storage/WorldSaveStorage
FIELD f_dgohnkjg DISK_SPACE_WARNING_THRESHOLD I
FIELD f_jpohltpc DATA_KEY Ljava/lang/String;
FIELD f_lplhvbwf dataFixer Lcom/mojang/datafixers/DataFixer;
FIELD f_rbwrlarm savesDirectory Ljava/nio/file/Path;
Expand Down
10 changes: 10 additions & 0 deletions mappings/net/minecraft/world/updater/WorldUpdater.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,22 @@ CLASS net/minecraft/unmapped/C_jzcarjio net/minecraft/world/updater/WorldUpdater
METHOD m_mwciwufv getUpgradedChunkCount ()I
METHOD m_odmmiwiy getTotalChunkCount ()I
METHOD m_ptgwpfqg getProgress ()F
METHOD m_qltezbme resolveRecreationDirectory (Ljava/nio/file/Path;)Ljava/nio/file/Path;
ARG 0 current
METHOD m_qycehcat getStatus ()Lnet/minecraft/unmapped/C_rdaqiwdt;
METHOD m_ttzfkvij updateWorld ()V
METHOD m_xwtoipav (Ljava/lang/Thread;Ljava/lang/Throwable;)V
ARG 1 thread
ARG 2 throwable
CLASS C_adeqquth SimpleRegionStorageUpdater
METHOD <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
ARG 2 dataFixTypes
ARG 3 type
ARG 4 upgradingStatus
ARG 5 finishedStatus
METHOD m_uduopfej updateNbt (Lnet/minecraft/unmapped/C_gwzzviyw;Lnet/minecraft/unmapped/C_hhlwcnih;)Lnet/minecraft/unmapped/C_hhlwcnih;
ARG 1 storage
ARG 2 nbt
CLASS C_glywgfig DimensionData
CLASS C_itdvsyqy AbstractUpdater
FIELD f_htrsqjeu previousWriteFuture Ljava/util/concurrent/CompletableFuture;
Expand Down

2 comments on commit ee79264

@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 ee79264, 20 file(s) were updated with 316 line(s) added and 277 removed compared to the latest Quilt Mappings version.

View the diff here (1/2): 
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:32:04.509975592 +0000
+++ namedSrc/net/minecraft/data/report/BiomeParametersProvider.java	2024-04-02 02:30:55.485908045 +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/server/integrated/IntegratedServerLoader.java namedSrc/net/minecraft/server/integrated/IntegratedServerLoader.java
--- namedTargetSrc/net/minecraft/server/integrated/IntegratedServerLoader.java	2024-04-02 02:32:04.733975840 +0000
+++ namedSrc/net/minecraft/server/integrated/IntegratedServerLoader.java	2024-04-02 02:30:55.673908161 +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:32:04.761975870 +0000
+++ namedSrc/net/minecraft/server/Main.java	2024-04-02 02:30:55.697908175 +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:32:04.801975915 +0000
+++ namedSrc/net/minecraft/server/world/ServerWorld.java	2024-04-02 02:30:55.725908193 +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:32:04.833975950 +0000
+++ namedSrc/net/minecraft/server/world/ThreadedChunkManager.java	2024-04-02 02:30:55.753908210 +0000
@@ -67,7 +67,6 @@
 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;
@@ -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);
Only in namedTargetSrc/net/minecraft/unmapped: C_gwzzviyw.java
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
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:32:04.669975769 +0000
+++ namedSrc/net/minecraft/util/profiling/jfr/event/ChunkEvent.java	2024-04-02 02:30:55.625908131 +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:32:04.777975888 +0000
+++ namedSrc/net/minecraft/util/profiling/jfr/event/ChunkRegionReadEvent.java	2024-04-02 02:30:55.709908183 +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:32:04.585975676 +0000
+++ namedSrc/net/minecraft/util/profiling/jfr/event/ChunkRegionWriteEvent.java	2024-04-02 02:30:55.553908086 +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:32:04.813975928 +0000
+++ namedSrc/net/minecraft/util/profiling/jfr/JfrProfiler.java	2024-04-02 02:30:55.737908200 +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:32:04.565975654 +0000
+++ namedSrc/net/minecraft/util/profiling/jfr/JvmProfiler.java	2024-04-02 02:30:55.533908075 +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:32:04.597975689 +0000
+++ namedSrc/net/minecraft/world/biome/util/MultiNoiseBiomeSourceParameterList.java	2024-04-02 02:30:55.561908091 +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/poi/PointOfInterestStorage.java namedSrc/net/minecraft/world/poi/PointOfInterestStorage.java
--- namedTargetSrc/net/minecraft/world/poi/PointOfInterestStorage.java	2024-04-02 02:32:04.525975611 +0000
+++ namedSrc/net/minecraft/world/poi/PointOfInterestStorage.java	2024-04-02 02:30:55.501908054 +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:32:04.533975619 +0000
+++ namedSrc/net/minecraft/world/storage/EntityChunkDataAccess.java	2024-04-02 02:30:55.509908059 +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:32:04.533975619 +0000
+++ namedSrc/net/minecraft/world/storage/RegionBasedStorage.java	2024-04-02 02:30:55.509908059 +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:32:04.657975756 +0000
+++ namedSrc/net/minecraft/world/storage/RegionFile.java	2024-04-02 02:30:55.613908124 +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:32:04.709975813 +0000
+++ namedSrc/net/minecraft/world/storage/SerializingRegionBasedStorage.java	2024-04-02 02:30:55.657908151 +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:32:04.733975840 +0000
+++ namedSrc/net/minecraft/world/storage/StorageIoWorker.java	2024-04-02 02:30:55.673908161 +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:32:04.765975875 +0000
+++ namedSrc/net/minecraft/world/storage/VersionedChunkStorage.java	2024-04-02 02:30:55.701908178 +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:32:04.805975919 +0000
+++ namedSrc/net/minecraft/world/storage/WorldSaveStorage.java	2024-04-02 02:30:55.729908195 +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 (2/2): 
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:32:04.785975897 +0000
+++ namedSrc/net/minecraft/world/updater/WorldUpdater.java	2024-04-02 02:30:55.713908185 +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;
@@ -78,9 +78,10 @@
     */
    static final MutableText f_ndykkudb = 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
     */
@@ -109,9 +110,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 +150,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 +189,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 +200,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 +230,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 +306,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;}
+    * @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 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
-       */
-      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 +413,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 +426,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 +478,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 +489,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 +503,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 +530,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 +563,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() {
+      ChunkUpdater() {
          super(DataFixTypes.CHUNK, "chunk", "region", WorldUpdater.f_zgbdxxsa, WorldUpdater.f_gibhqwaa);
       }
 
       /**
        * @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 +606,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,45 +621,59 @@
 
       /**
        * @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.f_waxkuxwz);
       }
 
       /**
        * 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() {
+      PoiUpdater() {
          super(DataFixTypes.POI_CHUNK, "poi", WorldUpdater.f_itsyqabx, WorldUpdater.f_ndykkudb);
       }
 
@@ -715,8 +681,76 @@
        * 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.