yet more world stuff (#456) · QuiltMC/quilt-mappings@3602d4d

github-actions · 2023-07-05T00:15:59Z

With commit 3602d4d, 46 file(s) were updated with 496 line(s) added and 425 removed compared to the latest Quilt Mappings version.

View the diff here (1/3):

diff -bur namedTargetSrc/net/minecraft/block/entity/CommandBlockBlockEntity.java namedSrc/net/minecraft/block/entity/CommandBlockBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/CommandBlockBlockEntity.java	2023-07-05 00:15:56.857583737 +0000
+++ namedSrc/net/minecraft/block/entity/CommandBlockBlockEntity.java	2023-07-05 00:14:07.643712162 +0000
@@ -95,7 +95,7 @@
        * Mapping not found
        */
       @Override
-      public boolean m_xsgoevxf() {
+      public boolean isValid() {
          return !CommandBlockBlockEntity.this.isRemoved();
       }
    };
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/ingame/AbstractCommandBlockScreen.java namedSrc/net/minecraft/client/gui/screen/ingame/AbstractCommandBlockScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/ingame/AbstractCommandBlockScreen.java	2023-07-05 00:15:56.829583275 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ingame/AbstractCommandBlockScreen.java	2023-07-05 00:14:07.599711369 +0000
@@ -81,7 +81,7 @@
    @Override
    public void tick() {
       this.consoleCommandTextField.tick();
-      if (!this.getCommandExecutor().m_xsgoevxf()) {
+      if (!this.getCommandExecutor().isValid()) {
          this.closeScreen();
       }
    }
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/recipe/book/RecipeAlternativesWidget.java namedSrc/net/minecraft/client/gui/screen/recipe/book/RecipeAlternativesWidget.java
--- namedTargetSrc/net/minecraft/client/gui/screen/recipe/book/RecipeAlternativesWidget.java	2023-07-05 00:15:56.849583605 +0000
+++ namedSrc/net/minecraft/client/gui/screen/recipe/book/RecipeAlternativesWidget.java	2023-07-05 00:14:07.635712018 +0000
@@ -202,7 +202,7 @@
     * Mapping not found
     */
    @Override
-   public boolean isMouseOver(double mouseX, double mouseY) {
+   public boolean isMouseOver(double d, double e) {
       return false;
    }
 
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/recipe/book/RecipeBookWidget.java namedSrc/net/minecraft/client/gui/screen/recipe/book/RecipeBookWidget.java
--- namedTargetSrc/net/minecraft/client/gui/screen/recipe/book/RecipeBookWidget.java	2023-07-05 00:15:56.933584992 +0000
+++ namedSrc/net/minecraft/client/gui/screen/recipe/book/RecipeBookWidget.java	2023-07-05 00:14:07.727713675 +0000
@@ -616,7 +616,7 @@
     * Mapping not found
     */
    @Override
-   public boolean isMouseOver(double mouseX, double mouseY) {
+   public boolean isMouseOver(double d, double e) {
       return false;
    }
 
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/Screen.java namedSrc/net/minecraft/client/gui/screen/Screen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/Screen.java	2023-07-05 00:15:56.805582878 +0000
+++ namedSrc/net/minecraft/client/gui/screen/Screen.java	2023-07-05 00:14:07.547710432 +0000
@@ -727,7 +727,7 @@
     * Mapping not found
     */
    @Override
-   public boolean isMouseOver(double mouseX, double mouseY) {
+   public boolean isMouseOver(double d, double e) {
       return true;
    }
 
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/TitleScreen.java namedSrc/net/minecraft/client/gui/screen/TitleScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/TitleScreen.java	2023-07-05 00:15:56.829583275 +0000
+++ namedSrc/net/minecraft/client/gui/screen/TitleScreen.java	2023-07-05 00:14:07.599711369 +0000
@@ -353,7 +353,7 @@
                arg -> {
                   WorldSaveStorage lv = this.client.getWorldStorage();
          
-                  try (WorldSaveStorage.Session lv2 = lv.createSession("Demo_World")) {
+                  try (WorldSaveStorage.Session lv2 = lv.createUncheckedSession("Demo_World")) {
                      WorldSaveSummary lv3 = lv2.getWorldSaveSummary();
                      if (lv3 != null) {
                         this.client
@@ -386,7 +386,7 @@
    private boolean canReadDemoWorldData() {
       try {
          boolean var2;
-         try (WorldSaveStorage.Session lv = this.client.getWorldStorage().createSession("Demo_World")) {
+         try (WorldSaveStorage.Session lv = this.client.getWorldStorage().createUncheckedSession("Demo_World")) {
             var2 = lv.getWorldSaveSummary() != null;
          }
 
@@ -499,7 +499,7 @@
     */
    private void onDemoDeletionConfirmed(boolean delete) {
       if (delete) {
-         try (WorldSaveStorage.Session lv = this.client.getWorldStorage().createSession("Demo_World")) {
+         try (WorldSaveStorage.Session lv = this.client.getWorldStorage().createUncheckedSession("Demo_World")) {
             lv.deleteSessionLock();
          } catch (IOException var7) {
             SystemToast.addWorldDeleteFailureToast(this.client, "Demo_World");
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/world/CreateWorldScreen.java namedSrc/net/minecraft/client/gui/screen/world/CreateWorldScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/world/CreateWorldScreen.java	2023-07-05 00:15:56.789582614 +0000
+++ namedSrc/net/minecraft/client/gui/screen/world/CreateWorldScreen.java	2023-07-05 00:14:07.531710144 +0000
@@ -678,7 +678,7 @@
       String string = this.worldCreator.m_xirteeuv();
 
       try {
-         WorldSaveStorage.Session lv = this.client.getWorldStorage().createSession(string);
+         WorldSaveStorage.Session lv = this.client.getWorldStorage().createUncheckedSession(string);
          if (this.dataPackTempDir == null) {
             return Optional.of(lv);
          }
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/world/EditWorldScreen.java namedSrc/net/minecraft/client/gui/screen/world/EditWorldScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/world/EditWorldScreen.java	2023-07-05 00:15:56.933584992 +0000
+++ namedSrc/net/minecraft/client/gui/screen/world/EditWorldScreen.java	2023-07-05 00:14:07.739713892 +0000
@@ -18,10 +18,10 @@
 import net.minecraft.text.CommonTexts;
 import net.minecraft.text.Text;
 import net.minecraft.util.FileNameUtil;
-import net.minecraft.util.InvalidSymlinkException;
 import net.minecraft.util.Util;
 import net.minecraft.util.WorldSavePath;
 import net.minecraft.util.math.MathHelper;
+import net.minecraft.util.path.InvalidSymlinkException;
 import net.minecraft.world.storage.WorldSaveStorage;
 import net.minecraft.world.storage.WorldSaveSummary;
 import org.apache.commons.io.FileUtils;
@@ -185,7 +185,7 @@
    public static void onBackupConfirm(WorldSaveStorage storage, String levelName) {
       boolean bl = false;
 
-      try (WorldSaveStorage.Session lv = storage.m_vtcefrig(levelName)) {
+      try (WorldSaveStorage.Session lv = storage.createSession(levelName)) {
          bl = true;
          backupLevel(lv);
       } catch (IOException var8) {
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/world/WorldListWidget.java namedSrc/net/minecraft/client/gui/screen/world/WorldListWidget.java
--- namedTargetSrc/net/minecraft/client/gui/screen/world/WorldListWidget.java	2023-07-05 00:15:56.881584133 +0000
+++ namedSrc/net/minecraft/client/gui/screen/world/WorldListWidget.java	2023-07-05 00:14:07.671712666 +0000
@@ -49,11 +49,11 @@
 import net.minecraft.text.Text;
 import net.minecraft.util.Formatting;
 import net.minecraft.util.Identifier;
-import net.minecraft.util.InvalidSymlinkException;
-import net.minecraft.util.Symlink;
 import net.minecraft.util.Util;
 import net.minecraft.util.WorldSavePath;
 import net.minecraft.util.crash.CrashReport;
+import net.minecraft.util.path.InvalidSymlinkException;
+import net.minecraft.util.path.Symlink;
 import net.minecraft.world.WorldInfo;
 import net.minecraft.world.storage.WorldSaveStorage;
 import net.minecraft.world.storage.WorldSaveStorageException;
@@ -510,7 +510,7 @@
                BasicFileAttributes basicFileAttributes = Files.readAttributes(this.iconFile, BasicFileAttributes.class, LinkOption.NOFOLLOW_LINKS);
                if (basicFileAttributes.isSymbolicLink()) {
                   List<Symlink> list = new ArrayList();
-                  this.client.getWorldStorage().m_hzomuijm().m_gnwqyyfp(this.iconFile, list);
+                  this.client.getWorldStorage().getSymlinkValidator().validate(this.iconFile, list);
                   if (!list.isEmpty()) {
                      WorldListWidget.LOGGER.warn(InvalidSymlinkException.createErrorMessage(this.iconFile, list));
                      this.iconFile = null;
@@ -665,7 +665,7 @@
                      if (backup) {
                         String stringx = this.level.getName();
 
-                        try (WorldSaveStorage.Session lv2x = this.client.getWorldStorage().m_vtcefrig(stringx)) {
+                        try (WorldSaveStorage.Session lv2x = this.client.getWorldStorage().createSession(stringx)) {
                            EditWorldScreen.backupLevel(lv2x);
                         } catch (IOException var9) {
                            SystemToast.addWorldAccessFailureToast(this.client, stringx);
@@ -746,7 +746,7 @@
          WorldSaveStorage lv = this.client.getWorldStorage();
          String string = this.level.getName();
 
-         try (WorldSaveStorage.Session lv2 = lv.createSession(string)) {
+         try (WorldSaveStorage.Session lv2 = lv.createUncheckedSession(string)) {
             lv2.deleteSessionLock();
          } catch (IOException var8) {
             SystemToast.addWorldDeleteFailureToast(this.client, string);
@@ -768,7 +768,7 @@
             String string = this.level.getName();
 
             try {
-               WorldSaveStorage.Session lv = this.client.getWorldStorage().m_vtcefrig(string);
+               WorldSaveStorage.Session lv = this.client.getWorldStorage().createSession(string);
                this.client.setScreen(new EditWorldScreen(bl -> {
                   try {
                      lv.close();
@@ -803,7 +803,7 @@
          } else {
             this.openReadingWorldScreen();
 
-            try (WorldSaveStorage.Session lv = this.client.getWorldStorage().m_vtcefrig(this.level.getName())) {
+            try (WorldSaveStorage.Session lv = this.client.getWorldStorage().createSession(this.level.getName())) {
                Pair<WorldInfo, WorldCreationContext> pair = this.client.createIntegratedServerLoader().m_ybvlofhx(lv);
                WorldInfo lv2 = pair.getFirst();
                WorldCreationContext lv3 = pair.getSecond();
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/ClickableWidget.java namedSrc/net/minecraft/client/gui/widget/ClickableWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/ClickableWidget.java	2023-07-05 00:15:56.929584926 +0000
+++ namedSrc/net/minecraft/client/gui/widget/ClickableWidget.java	2023-07-05 00:14:07.723713603 +0000
@@ -406,13 +406,13 @@
     * Mapping not found
     */
    @Override
-   public boolean isMouseOver(double mouseX, double mouseY) {
+   public boolean isMouseOver(double d, double e) {
       return this.active
          && this.visible
-         && mouseX >= (double)this.getX()
-         && mouseY >= (double)this.getY()
-         && mouseX < (double)(this.getX() + this.width)
-         && mouseY < (double)(this.getY() + this.height);
+         && d >= (double)this.getX()
+         && e >= (double)this.getY()
+         && d < (double)(this.getX() + this.width)
+         && e < (double)(this.getY() + this.height);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/EntryListWidget.java namedSrc/net/minecraft/client/gui/widget/EntryListWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/EntryListWidget.java	2023-07-05 00:15:56.793582680 +0000
+++ namedSrc/net/minecraft/client/gui/widget/EntryListWidget.java	2023-07-05 00:14:07.539710288 +0000
@@ -683,8 +683,8 @@
     * Mapping not found
     */
    @Override
-   public boolean isMouseOver(double mouseX, double mouseY) {
-      return mouseY >= (double)this.top && mouseY <= (double)this.bottom && mouseX >= (double)this.left && mouseX <= (double)this.right;
+   public boolean isMouseOver(double d, double e) {
+      return e >= (double)this.top && e <= (double)this.bottom && d >= (double)this.left && d <= (double)this.right;
    }
 
    /**
@@ -957,8 +957,8 @@
        * @mapping {@literal named isMouseOver Lnet/minecraft/client/gui/widget/EntryListWidget$Entry;isMouseOver(DD)Z}
        */
       @Override
-      public boolean isMouseOver(double mouseX, double mouseY) {
-         return Objects.equals(this.parentList.getEntryAtPosition(mouseX, mouseY), this);
+      public boolean isMouseOver(double d, double e) {
+         return Objects.equals(this.parentList.getEntryAtPosition(d, e), this);
       }
    }
 }
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/TextFieldWidget.java namedSrc/net/minecraft/client/gui/widget/TextFieldWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/TextFieldWidget.java	2023-07-05 00:15:56.809582944 +0000
+++ namedSrc/net/minecraft/client/gui/widget/TextFieldWidget.java	2023-07-05 00:14:07.551710504 +0000
@@ -749,12 +749,12 @@
     * Mapping not found
     */
    @Override
-   public boolean isMouseOver(double mouseX, double mouseY) {
+   public boolean isMouseOver(double d, double e) {
       return this.visible
-         && mouseX >= (double)this.getX()
-         && mouseX < (double)(this.getX() + this.width)
-         && mouseY >= (double)this.getY()
-         && mouseY < (double)(this.getY() + this.height);
+         && d >= (double)this.getX()
+         && d < (double)(this.getX() + this.width)
+         && e >= (double)this.getY()
+         && e < (double)(this.getY() + this.height);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/MinecraftClient.java namedSrc/net/minecraft/client/MinecraftClient.java
--- namedTargetSrc/net/minecraft/client/MinecraftClient.java	2023-07-05 00:15:56.809582944 +0000
+++ namedSrc/net/minecraft/client/MinecraftClient.java	2023-07-05 00:14:07.551710504 +0000
@@ -210,7 +210,6 @@
 import net.minecraft.text.MutableText;
 import net.minecraft.text.Text;
 import net.minecraft.text.component.KeyBindTextResolver;
-import net.minecraft.unmapped.C_jgxjjhjn;
 import net.minecraft.unmapped.C_znpzgoww;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.FileNameUtil;
@@ -238,6 +237,7 @@
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
 import net.minecraft.util.math.MathHelper;
+import net.minecraft.util.path.SymlinkValidator;
 import net.minecraft.util.profiler.DebugRecorder;
 import net.minecraft.util.profiler.DummyProfiler;
 import net.minecraft.util.profiler.DummyRecorder;
@@ -1070,7 +1070,7 @@
       this.resourceManager.registerReloader(this.textureManager);
       this.skinProvider = new PlayerSkinProvider(this.textureManager, new File(file, "skins"), this.sessionService);
       Path path = this.runDirectory.toPath();
-      C_jgxjjhjn lv5 = WorldSaveStorage.m_yekueuyb(path.resolve("allowed_symlinks.txt"));
+      SymlinkValidator lv5 = WorldSaveStorage.getSymlinkValidator(path.resolve("allowed_symlinks.txt"));
       this.worldStorage = new WorldSaveStorage(path.resolve("saves"), path.resolve("backups"), lv5, this.dataFixer);
       this.soundManager = new SoundManager(this.options);
       this.resourceManager.registerReloader(this.soundManager);
diff -bur namedTargetSrc/net/minecraft/client/realms/FileDownload.java namedSrc/net/minecraft/client/realms/FileDownload.java
--- namedTargetSrc/net/minecraft/client/realms/FileDownload.java	2023-07-05 00:15:56.769582284 +0000
+++ namedSrc/net/minecraft/client/realms/FileDownload.java	2023-07-05 00:14:07.507709711 +0000
@@ -24,8 +24,8 @@
 import net.minecraft.client.realms.gui.screen.RealmsDownloadLatestWorldScreen;
 import net.minecraft.nbt.NbtCompound;
 import net.minecraft.nbt.NbtIo;
-import net.minecraft.util.InvalidSymlinkException;
 import net.minecraft.util.WorldSavePath;
+import net.minecraft.util.path.InvalidSymlinkException;
 import net.minecraft.world.storage.WorldSaveStorage;
 import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
 import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
@@ -407,7 +407,7 @@
             archive.delete();
          }
 
-         try (WorldSaveStorage.Session lv6 = storage.m_vtcefrig(string4)) {
+         try (WorldSaveStorage.Session lv6 = storage.createSession(string4)) {
             lv6.save(string4.trim());
             Path path3 = lv6.getDirectory(WorldSavePath.WORLD_DAT);
             readNbtFile(path3.toFile());
diff -bur namedTargetSrc/net/minecraft/entity/vehicle/CommandBlockMinecartEntity.java namedSrc/net/minecraft/entity/vehicle/CommandBlockMinecartEntity.java
--- namedTargetSrc/net/minecraft/entity/vehicle/CommandBlockMinecartEntity.java	2023-07-05 00:15:56.917584728 +0000
+++ namedSrc/net/minecraft/entity/vehicle/CommandBlockMinecartEntity.java	2023-07-05 00:14:07.707713315 +0000
@@ -231,7 +231,7 @@
        * Mapping not found
        */
       @Override
-      public boolean m_xsgoevxf() {
+      public boolean isValid() {
          return !CommandBlockMinecartEntity.this.isRemoved();
       }
    }
diff -bur namedTargetSrc/net/minecraft/server/command/CloneCommand.java namedSrc/net/minecraft/server/command/CloneCommand.java
--- namedTargetSrc/net/minecraft/server/command/CloneCommand.java	2023-07-05 00:15:56.957585389 +0000
+++ namedSrc/net/minecraft/server/command/CloneCommand.java	2023-07-05 00:14:07.751714108 +0000
@@ -357,7 +357,7 @@
                lv8.updateNeighbors(lv24.pos, lv24.state.getBlock());
             }
 
-            lv8.getBlockTickScheduler().m_tjhcqdwk(lv7.getBlockTickScheduler(), lv3, lv9);
+            lv8.getBlockTickScheduler().scheduleTicks(lv7.getBlockTickScheduler(), lv3, lv9);
             if (n == 0) {
                throw FAILED_EXCEPTION.create();
             } else {
diff -bur namedTargetSrc/net/minecraft/server/integrated/IntegratedServerLoader.java namedSrc/net/minecraft/server/integrated/IntegratedServerLoader.java
--- namedTargetSrc/net/minecraft/server/integrated/IntegratedServerLoader.java	2023-07-05 00:15:56.901584464 +0000
+++ namedSrc/net/minecraft/server/integrated/IntegratedServerLoader.java	2023-07-05 00:14:07.691713027 +0000
@@ -40,9 +40,9 @@
 import net.minecraft.server.world.FeatureAndDataSettings;
 import net.minecraft.text.CommonTexts;
 import net.minecraft.text.Text;
-import net.minecraft.util.InvalidSymlinkException;
 import net.minecraft.util.Util;
 import net.minecraft.util.crash.CrashReport;
+import net.minecraft.util.path.InvalidSymlinkException;
 import net.minecraft.world.SaveProperties;
 import net.minecraft.world.WorldInfo;
 import net.minecraft.world.WorldSaveProperties;
@@ -132,7 +132,7 @@
    @Nullable
    private WorldSaveStorage.Session createStorageSession(String worldName) {
       try {
-         return this.levelStorage.m_vtcefrig(worldName);
+         return this.levelStorage.createSession(worldName);
       } catch (IOException var3) {
          LOGGER.warn("Failed to read level {} data", worldName, var3);
          SystemToast.addWorldAccessFailureToast(this.client, worldName);
diff -bur namedTargetSrc/net/minecraft/server/Main.java namedSrc/net/minecraft/server/Main.java
--- namedTargetSrc/net/minecraft/server/Main.java	2023-07-05 00:15:56.917584728 +0000
+++ namedSrc/net/minecraft/server/Main.java	2023-07-05 00:14:07.711713387 +0000
@@ -136,7 +136,7 @@
          Services lv3 = Services.create(new YggdrasilAuthenticationService(Proxy.NO_PROXY), file);
          String string = (String)Optional.ofNullable(optionSet.valueOf(optionSpec11)).orElse(lv.getPropertiesHandler().levelName);
          WorldSaveStorage lv4 = WorldSaveStorage.create(file.toPath());
-         WorldSaveStorage.Session lv5 = lv4.m_vtcefrig(string);
+         WorldSaveStorage.Session lv5 = lv4.createSession(string);
          WorldSaveSummary lv6 = lv5.getWorldSaveSummary();
          if (lv6 != null) {
             if (lv6.doesRequireConversion()) {
diff -bur namedTargetSrc/net/minecraft/server/world/ServerWorld.java namedSrc/net/minecraft/server/world/ServerWorld.java
--- namedTargetSrc/net/minecraft/server/world/ServerWorld.java	2023-07-05 00:15:56.937585058 +0000
+++ namedSrc/net/minecraft/server/world/ServerWorld.java	2023-07-05 00:14:07.739713892 +0000
@@ -599,7 +599,7 @@
     */
    private void wakeSleepingPlayers() {
       this.sleepManager.clearSleeping();
-      ((List)this.players.stream().filter(LivingEntity::isSleeping).collect(Collectors.toList())).forEach(arg -> arg.wakeUp(false, false));
+      ((List)this.players.stream().filter(LivingEntity::isSleeping).collect(Collectors.toList())).forEach(player -> player.wakeUp(false, false));
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/server/world/ThreadedChunkManager.java namedSrc/net/minecraft/server/world/ThreadedChunkManager.java
--- namedTargetSrc/net/minecraft/server/world/ThreadedChunkManager.java	2023-07-05 00:15:56.965585521 +0000
+++ namedSrc/net/minecraft/server/world/ThreadedChunkManager.java	2023-07-05 00:14:07.759714252 +0000
@@ -829,7 +829,7 @@
             this.ticketManager.addTicketWithLevel(ChunkTicketType.LIGHT, lv, ChunkLevels.byStatus(ChunkStatus.LIGHT), lv);
          }
 
-         if (!requiredStatus.m_lolpswyr()) {
+         if (!requiredStatus.hasLoadDependencies()) {
             Optional<Chunk> optional = ((Either)holder.getChunkAt(requiredStatus.getPrevious(), this).getNow(ChunkHolder.UNLOADED_CHUNK)).left();
             if (optional.isPresent() && ((Chunk)optional.get()).getStatus().isAtLeast(requiredStatus)) {
                CompletableFuture<Either<Chunk, ChunkHolder.Unloaded>> completableFuture = requiredStatus.runLoadTask(
@@ -1333,7 +1333,7 @@
     * Mapping not found
     */
    private NbtCompound m_lcelmbnp(NbtCompound arg) {
-      return this.m_rbmihoak(this.world.getRegistryKey(), this.persistentStateManagerFactory, arg, this.chunkGenerator.getCodecKey());
+      return this.updateChunkNbt(this.world.getRegistryKey(), this.persistentStateManagerFactory, arg, this.chunkGenerator.getCodecKey());
    }
 
    /**
Only in namedTargetSrc/net/minecraft/unmapped: C_dpwvcnei.java
Only in namedTargetSrc/net/minecraft/unmapped: C_jgxjjhjn.java
diff -bur namedTargetSrc/net/minecraft/util/DependencySorter.java namedSrc/net/minecraft/util/DependencySorter.java
--- namedTargetSrc/net/minecraft/util/DependencySorter.java	2023-07-05 00:15:56.777582416 +0000
+++ namedSrc/net/minecraft/util/DependencySorter.java	2023-07-05 00:14:07.519709928 +0000
@@ -34,9 +34,9 @@
     * @mapping {@literal hashed m_hwfbhpsk Lnet/minecraft/unmapped/C_vnjbukpx;m_hwfbhpsk(Lcom/google/common/collect/Multimap;Ljava/util/Set;Ljava/lang/Object;Ljava/util/function/BiConsumer;)V}
     * @mapping {@literal named visitDependenciesAndEntry Lnet/minecraft/util/DependencySorter;visitDependenciesAndEntry(Lcom/google/common/collect/Multimap;Ljava/util/Set;Ljava/lang/Object;Ljava/util/function/BiConsumer;)V}
     */
-   private void visitDependenciesAndEntry(Multimap<K, K> entries, Set<K> set, K key, BiConsumer<K, V> entryConsumer) {
-      if (set.add(key)) {
-         entries.get(key).forEach(dependency -> this.visitDependenciesAndEntry(entries, set, (K)dependency, entryConsumer));
+   private void visitDependenciesAndEntry(Multimap<K, K> entries, Set<K> dependencies, K key, BiConsumer<K, V> entryConsumer) {
+      if (dependencies.add(key)) {
+         entries.get(key).forEach(dependency -> this.visitDependenciesAndEntry(entries, dependencies, (K)dependency, entryConsumer));
          V lv = (V)this.entries.get(key);
          if (lv != null) {
             entryConsumer.accept(key, lv);
@@ -50,7 +50,7 @@
     */
    private static <K> boolean isCyclic(Multimap<K, K> dependencies, K key, K dependencyKey) {
       Collection<K> collection = dependencies.get(dependencyKey);
-      return collection.contains(key) ? true : collection.stream().anyMatch(object2 -> isCyclic(dependencies, key, (K)object2));
+      return collection.contains(key) ? true : collection.stream().anyMatch(dependency -> isCyclic(dependencies, key, (K)dependency));
    }
 
    /**
@@ -72,7 +72,7 @@
       this.entries.forEach((key, value) -> value.visitRequiredDependencies(dependencyKey -> addDependencyIfNotCyclic(multimap, (K)key, (K)dependencyKey)));
       this.entries.forEach((key, value) -> value.visitOptionalDependencies(dependencyKey -> addDependencyIfNotCyclic(multimap, (K)key, (K)dependencyKey)));
       Set<K> set = new HashSet();
-      this.entries.keySet().forEach(object -> this.visitDependenciesAndEntry(multimap, set, (K)object, collector));
+      this.entries.keySet().forEach(entry -> this.visitDependenciesAndEntry(multimap, set, (K)entry, collector));
    }
 
    /**
Only in namedTargetSrc/net/minecraft/util: InvalidSymlinkException.java
Only in namedSrc/net/minecraft/util: path
Only in namedTargetSrc/net/minecraft/util: Symlink.java
diff -bur namedTargetSrc/net/minecraft/world/chunk/Chunk.java namedSrc/net/minecraft/world/chunk/Chunk.java
--- namedTargetSrc/net/minecraft/world/chunk/Chunk.java	2023-07-05 00:15:56.917584728 +0000
+++ namedSrc/net/minecraft/world/chunk/Chunk.java	2023-07-05 00:14:07.711713387 +0000
@@ -134,9 +134,10 @@
     */
    protected final Map<Heightmap.Type, Heightmap> heightmaps = Maps.newEnumMap(Heightmap.Type.class);
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_tvmxdtur Lnet/minecraft/unmapped/C_lwzmmmqr;f_tvmxdtur:Lnet/minecraft/unmapped/C_molcobnw;}
+    * @mapping {@literal named skyLightSources Lnet/minecraft/world/chunk/Chunk;skyLightSources:Lnet/minecraft/world/chunk/light/ChunkSkyLightSources;}
     */
-   protected ChunkSkyLightSources f_tvmxdtur;
+   protected ChunkSkyLightSources skyLightSources;
    /**
     * @mapping {@literal hashed f_bfbtcire Lnet/minecraft/unmapped/C_lwzmmmqr;f_bfbtcire:Ljava/util/Map;}
     * @mapping {@literal named structureStarts Lnet/minecraft/world/chunk/Chunk;structureStarts:Ljava/util/Map;}
@@ -188,7 +189,7 @@
       this.inhabitedTime = inhabitedTime;
       this.postProcessingLists = new ShortList[heightLimitView.countVerticalSections()];
       this.blendingData = blendingData;
-      this.f_tvmxdtur = new ChunkSkyLightSources(heightLimitView);
+      this.skyLightSources = new ChunkSkyLightSources(heightLimitView);
       if (sectionArrayInitializer != null) {
          if (this.sectionArray.length == sectionArrayInitializer.length) {
             System.arraycopy(sectionArrayInitializer, 0, this.sectionArray, 0, this.sectionArray.length);
@@ -401,7 +402,7 @@
     */
    @Override
    public void addStructureReference(StructureFeature structure, long reference) {
-      ((LongSet)this.structureReferences.computeIfAbsent(structure, arg -> new LongOpenHashSet())).add(reference);
+      ((LongSet)this.structureReferences.computeIfAbsent(structure, key -> new LongOpenHashSet())).add(reference);
       this.needsSaving = true;
    }
 
@@ -468,9 +469,10 @@
    public abstract ChunkStatus getStatus();
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_edeniyps Lnet/minecraft/unmapped/C_lwzmmmqr;m_edeniyps()Lnet/minecraft/unmapped/C_kogtzhzt;}
+    * @mapping {@literal named getHighestChunkStatus Lnet/minecraft/world/chunk/Chunk;getHighestChunkStatus()Lnet/minecraft/world/chunk/ChunkStatus;}
     */
-   public ChunkStatus m_edeniyps() {
+   public ChunkStatus getHighestChunkStatus() {
       ChunkStatus lv = this.getStatus();
       BelowZeroRetrogen lv2 = this.getBelowZeroRetrogen();
       if (lv2 != null) {
@@ -540,13 +542,14 @@
     */
    @Override
    public final void findBlockLightSources(BiConsumer<BlockPos, BlockState> callback) {
-      this.m_mfgzazfz(state -> state.getLuminance() != 0, callback);
+      this.forEachMatch(state -> state.getLuminance() != 0, callback);
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_mfgzazfz Lnet/minecraft/unmapped/C_lwzmmmqr;m_mfgzazfz(Ljava/util/function/Predicate;Ljava/util/function/BiConsumer;)V}
+    * @mapping {@literal named forEachMatch Lnet/minecraft/world/chunk/Chunk;forEachMatch(Ljava/util/function/Predicate;Ljava/util/function/BiConsumer;)V}
     */
-   public void m_mfgzazfz(Predicate<BlockState> predicate, BiConsumer<BlockPos, BlockState> biConsumer) {
+   public void forEachMatch(Predicate<BlockState> predicate, BiConsumer<BlockPos, BlockState> consumer) {
       BlockPos.Mutable lv = new BlockPos.Mutable();
 
       for (int i = this.getBottomSectionCoord(); i < this.getTopSectionCoord(); ++i) {
@@ -559,7 +562,7 @@
                   for (int l = 0; l < 16; ++l) {
                      BlockState lv4 = lv2.getBlockState(l, j, k);
                      if (predicate.test(lv4)) {
-                        biConsumer.accept(lv.set(lv3, l, j, k), lv4);
+                        consumer.accept(lv.set(lv3, l, j, k), lv4);
                      }
                   }
                }
@@ -783,10 +786,11 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_ymukudgt Lnet/minecraft/unmapped/C_lwzmmmqr;m_ymukudgt()V}
+    * @mapping {@literal named fillSkyLightSources Lnet/minecraft/world/chunk/Chunk;fillSkyLightSources()V}
     */
-   public void m_ymukudgt() {
-      this.f_tvmxdtur.fillFrom(this);
+   public void fillSkyLightSources() {
+      this.skyLightSources.fillFrom(this);
    }
 
    /**
@@ -794,7 +798,7 @@
     */
    @Override
    public ChunkSkyLightSources getSkyLightSources() {
-      return this.f_tvmxdtur;
+      return this.skyLightSources;
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/world/chunk/ChunkSection.java namedSrc/net/minecraft/world/chunk/ChunkSection.java
--- namedTargetSrc/net/minecraft/world/chunk/ChunkSection.java	2023-07-05 00:15:56.953585323 +0000
+++ namedSrc/net/minecraft/world/chunk/ChunkSection.java	2023-07-05 00:14:07.747714036 +0000
@@ -326,14 +326,14 @@
     * @mapping {@literal hashed m_mawlgajh Lnet/minecraft/unmapped/C_aurosfgf;m_mawlgajh(Lnet/minecraft/unmapped/C_nhlknxak;Lnet/minecraft/unmapped/C_ohqwadgy$C_pigoipju;III)V}
     * @mapping {@literal named populateBiomes Lnet/minecraft/world/chunk/ChunkSection;populateBiomes(Lnet/minecraft/world/biome/source/BiomeSupplier;Lnet/minecraft/world/biome/source/util/MultiNoiseUtil$MultiNoiseSampler;III)V}
     */
-   public void populateBiomes(BiomeSupplier biomeSupplier, MultiNoiseUtil.MultiNoiseSampler sampler, int x, int z, int k) {
+   public void populateBiomes(BiomeSupplier biomeSupplier, MultiNoiseUtil.MultiNoiseSampler sampler, int x, int y, int z) {
       PalettedContainer<Holder<Biome>> lv = this.biomeContainer.slice();
       int l = 4;
 
       for (int m = 0; m < 4; ++m) {
          for (int n = 0; n < 4; ++n) {
             for (int o = 0; o < 4; ++o) {
-               lv.setUnsafe(m, n, o, biomeSupplier.getNoiseBiome(x + m, z + n, k + o, sampler));
+               lv.setUnsafe(m, n, o, biomeSupplier.getNoiseBiome(x + m, y + n, z + o, sampler));
             }
          }
       }
diff -bur namedTargetSrc/net/minecraft/world/chunk/ChunkStatus.java namedSrc/net/minecraft/world/chunk/ChunkStatus.java
--- namedTargetSrc/net/minecraft/world/chunk/ChunkStatus.java	2023-07-05 00:15:56.853583671 +0000
+++ namedSrc/net/minecraft/world/chunk/ChunkStatus.java	2023-07-05 00:14:07.639712090 +0000
@@ -57,7 +57,7 @@
     * @mapping {@literal hashed f_hqwabpxv Lnet/minecraft/unmapped/C_kogtzhzt;f_hqwabpxv:Lnet/minecraft/unmapped/C_kogtzhzt$C_sldnkxjm;}
     * @mapping {@literal named STATUS_BUMP_LOAD_TASK Lnet/minecraft/world/chunk/ChunkStatus;STATUS_BUMP_LOAD_TASK:Lnet/minecraft/world/chunk/ChunkStatus$LoadTask;}
     */
-   private static final ChunkStatus.LoadTask STATUS_BUMP_LOAD_TASK = (targetStatus, world, arg3, lightingProvider, convertCallback, chunk) -> CompletableFuture.completedFuture(
+   private static final ChunkStatus.LoadTask STATUS_BUMP_LOAD_TASK = (targetStatus, world, structureTemplateManager, lightingProvider, convertCallback, chunk) -> CompletableFuture.completedFuture(
          Either.left(chunk)
       );
    /**
@@ -72,24 +72,28 @@
     * @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_txtwcqhv(
+   public static final ChunkStatus STRUCTURE_STARTS = register(
       "structure_starts",
       EMPTY,
       0,
       false,
       PRE_CARVER_HEIGHTMAPS,
       ChunkStatus.ChunkType.PROTOCHUNK,
-      (targetStatus, executor, world, chunkGenerator, arg4, lightingProvider, function, chunks, chunk) -> {
+      (targetStatus, executor, world, chunkGenerator, structureTemplateManager, lightingProvider, chunkConverter, chunks, chunk) -> {
          if (world.getServer().getSaveProperties().getGeneratorOptions().hasFeatureGeneration()) {
             chunkGenerator.setStructureStarts(
-               world.getRegistryManager(), world.getChunkManager().getConcentricRingPlacementCalculator(), world.getStructureManager(), chunk, arg4
+               world.getRegistryManager(),
+               world.getChunkManager().getConcentricRingPlacementCalculator(),
+               world.getStructureManager(),
+               chunk,
+               structureTemplateManager
             );
          }
    
          world.m_uwauhnel(chunk);
          return CompletableFuture.completedFuture(Either.left(chunk));
       },
-      (targetStatus, world, arg3, lightingProvider, convertCallback, chunk) -> {
+      (targetStatus, world, structureTemplateManager, lightingProvider, convertCallback, chunk) -> {
          world.m_uwauhnel(chunk);
          return CompletableFuture.completedFuture(Either.left(chunk));
       }
@@ -119,12 +123,12 @@
       8,
       PRE_CARVER_HEIGHTMAPS,
       ChunkStatus.ChunkType.PROTOCHUNK,
-      (targetStatus, executor, world, chunkGenerator, arg4, lightingProvider, function, chunks, chunk) -> {
+      (targetStatus, executor, world, chunkGenerator, structureTemplateManager, lightingProvider, chunkConverter, chunks, chunk) -> {
          ChunkRegion lv = new ChunkRegion(world, chunks, targetStatus, -1);
          return chunkGenerator.populateBiomes(
                executor, world.getChunkManager().getRandomState(), Blender.getBlender(lv), world.getStructureManager().forRegion(lv), chunk
             )
-            .thenApply(arg -> Either.left(arg));
+            .thenApply(result -> Either.left(result));
       }
    );
    /**
@@ -137,13 +141,13 @@
       8,
       PRE_CARVER_HEIGHTMAPS,
       ChunkStatus.ChunkType.PROTOCHUNK,
-      (targetStatus, executor, world, chunkGenerator, arg4, lightingProvider, function, chunks, chunk) -> {
+      (targetStatus, executor, world, chunkGenerator, structureTemplateManager, lightingProvider, chunkConverter, chunks, chunk) -> {
          ChunkRegion lv = new ChunkRegion(world, chunks, targetStatus, 0);
          return chunkGenerator.populateNoise(
                executor, Blender.getBlender(lv), world.getChunkManager().getRandomState(), world.getStructureManager().forRegion(lv), chunk
             )
-            .thenApply(arg -> {
-               if (arg instanceof ProtoChunk lvx) {
+            .thenApply(result -> {
+               if (result instanceof ProtoChunk lvx) {
                   BelowZeroRetrogen lv2 = lvx.getBelowZeroRetrogen();
                   if (lv2 != null) {
                      BelowZeroRetrogen.replaceOldBedrock(lvx);
@@ -153,7 +157,7 @@
                   }
                }
       
-               return Either.left(arg);
+               return Either.left(result);
             });
       }
    );
@@ -218,21 +222,21 @@
     * @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_txtwcqhv(
+   public static final ChunkStatus INITIALIZE_LIGHT = register(
       "initialize_light",
       FEATURES,
       0,
       false,
       POST_CARVER_HEIGHTMAPS,
       ChunkStatus.ChunkType.PROTOCHUNK,
-      (targetStatus, executor, world, chunkGenerator, arg4, lightingProvider, function, chunks, chunk) -> m_ojuzzjgl(lightingProvider, chunk),
-      (targetStatus, world, arg3, lightingProvider, function, chunk) -> m_ojuzzjgl(lightingProvider, chunk)
+      (targetStatus, executor, world, chunkGenerator, arg4, lightingProvider, function, chunks, chunk) -> initializeLight(lightingProvider, chunk),
+      (targetStatus, world, arg3, lightingProvider, function, chunk) -> initializeLight(lightingProvider, chunk)
    );
    /**
     * @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_txtwcqhv(
+   public static final ChunkStatus LIGHT = register(
       "light",
       INITIALIZE_LIGHT,
       1,
@@ -257,7 +261,7 @@
     * @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_txtwcqhv(
+   public static final ChunkStatus FULL = register(
       "full",
       SPAWN,
       0,
@@ -293,7 +297,7 @@
     * @mapping {@literal hashed f_ulqfgodx Lnet/minecraft/unmapped/C_kogtzhzt;f_ulqfgodx:Lit/unimi/dsi/fastutil/ints/IntList;}
     * @mapping {@literal named STATUS_TO_DISTANCE Lnet/minecraft/world/chunk/ChunkStatus;STATUS_TO_DISTANCE:Lit/unimi/dsi/fastutil/ints/IntList;}
     */
-   private static final IntList STATUS_TO_DISTANCE = Util.make(new IntArrayList(createOrderedList().size()), intArrayList -> {
+   private static final IntList STATUS_TO_DISTANCE = Util.make(new IntArrayList(createOrderedList().size()), list -> {
       int i = 0;
 
       for (int j = createOrderedList().size() - 1; j >= 0; --j) {
@@ -301,7 +305,7 @@
             ++i;
          }
 
-         intArrayList.add(0, i);
+         list.add(0, i);
       }
    });
    /**
@@ -330,9 +334,10 @@
     */
    private final int taskMargin;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_ulnfzeqc Lnet/minecraft/unmapped/C_kogtzhzt;f_ulnfzeqc:Z}
+    * @mapping {@literal named hasLoadDependencies Lnet/minecraft/world/chunk/ChunkStatus;hasLoadDependencies:Z}
     */
-   private final boolean f_ulnfzeqc;
+   private final boolean hasLoadDependencies;
    /**
     * @mapping {@literal hashed f_jubsnmxj Lnet/minecraft/unmapped/C_kogtzhzt;f_jubsnmxj:Lnet/minecraft/unmapped/C_kogtzhzt$C_lcffkbeg;}
     * @mapping {@literal named chunkType Lnet/minecraft/world/chunk/ChunkStatus;chunkType:Lnet/minecraft/world/chunk/ChunkStatus$ChunkType;}
@@ -345,13 +350,14 @@
    private final EnumSet<Heightmap.Type> heightMapTypes;
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_ojuzzjgl Lnet/minecraft/unmapped/C_kogtzhzt;m_ojuzzjgl(Lnet/minecraft/unmapped/C_bdzdhzyc;Lnet/minecraft/unmapped/C_lwzmmmqr;)Ljava/util/concurrent/CompletableFuture;}
+    * @mapping {@literal named initializeLight Lnet/minecraft/world/chunk/ChunkStatus;initializeLight(Lnet/minecraft/server/world/ServerLightingProvider;Lnet/minecraft/world/chunk/Chunk;)Ljava/util/concurrent/CompletableFuture;}
     */
-   private static CompletableFuture<Either<Chunk, ChunkHolder.Unloaded>> m_ojuzzjgl(ServerLightingProvider arg, Chunk arg2) {
-      arg2.m_ymukudgt();
-      ((ProtoChunk)arg2).setLightingProvider(arg);
-      boolean bl = shouldExcludeBlockLight(arg2);
-      return arg.initializeLight(arg2, bl).thenApply(Either::left);
+   private static CompletableFuture<Either<Chunk, ChunkHolder.Unloaded>> initializeLight(ServerLightingProvider lightingProvider, Chunk chunk) {
+      chunk.fillSkyLightSources();
+      ((ProtoChunk)chunk).setLightingProvider(lightingProvider);
+      boolean bl = shouldExcludeBlockLight(chunk);
+      return lightingProvider.initializeLight(chunk, bl).thenApply(Either::left);
    }
 
    /**
@@ -390,23 +396,26 @@
       ChunkStatus.ChunkType chunkType,
       ChunkStatus.GenerationTask task
    ) {
-      return m_txtwcqhv(id, previous, taskMargin, false, heightMapTypes, chunkType, task, STATUS_BUMP_LOAD_TASK);
+      return register(id, previous, taskMargin, false, heightMapTypes, chunkType, task, STATUS_BUMP_LOAD_TASK);
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_txtwcqhv Lnet/minecraft/unmapped/C_kogtzhzt;m_txtwcqhv(Ljava/lang/String;Lnet/minecraft/unmapped/C_kogtzhzt;IZLjava/util/EnumSet;Lnet/minecraft/unmapped/C_kogtzhzt$C_lcffkbeg;Lnet/minecraft/unmapped/C_kogtzhzt$C_wratqrbq;Lnet/minecraft/unmapped/C_kogtzhzt$C_sldnkxjm;)Lnet/minecraft/unmapped/C_kogtzhzt;}
+    * @mapping {@literal named register Lnet/minecraft/world/chunk/ChunkStatus;register(Ljava/lang/String;Lnet/minecraft/world/chunk/ChunkStatus;IZLjava/util/EnumSet;Lnet/minecraft/world/chunk/ChunkStatus$ChunkType;Lnet/minecraft/world/chunk/ChunkStatus$GenerationTask;Lnet/minecraft/world/chunk/ChunkStatus$LoadTask;)Lnet/minecraft/world/chunk/ChunkStatus;}
     */
-   private static ChunkStatus m_txtwcqhv(
-      String string,
-      @Nullable ChunkStatus arg,
-      int i,
-      boolean bl,
-      EnumSet<Heightmap.Type> enumSet,
-      ChunkStatus.ChunkType arg2,
-      ChunkStatus.GenerationTask arg3,
-      ChunkStatus.LoadTask arg4
+   private static ChunkStatus register(
+      String id,
+      @Nullable ChunkStatus previous,
+      int taskMargin,
+      boolean hasLoadDependencies,
+      EnumSet<Heightmap.Type> heightMapTypes,
+      ChunkStatus.ChunkType chunkType,
+      ChunkStatus.GenerationTask generationTask,
+      ChunkStatus.LoadTask loadTask
    ) {
-      return Registry.register(Registries.CHUNK_STATUS, string, new ChunkStatus(arg, i, bl, enumSet, arg2, arg3, arg4));
+      return Registry.register(
+         Registries.CHUNK_STATUS, id, new ChunkStatus(previous, taskMargin, hasLoadDependencies, heightMapTypes, chunkType, generationTask, loadTask)
+      );
    }
 
    /**
@@ -467,22 +476,22 @@
     * @mapping {@literal named <init> Lnet/minecraft/world/chunk/ChunkStatus;<init>(Lnet/minecraft/world/chunk/ChunkStatus;IZLjava/util/EnumSet;Lnet/minecraft/world/chunk/ChunkStatus$ChunkType;Lnet/minecraft/world/chunk/ChunkStatus$GenerationTask;Lnet/minecraft/world/chunk/ChunkStatus$LoadTask;)V}
     */
    ChunkStatus(
-      @Nullable ChunkStatus arg,
+      @Nullable ChunkStatus previous,
       int taskMargin,
-      boolean bl,
+      boolean hasLoadDependencies,
       EnumSet<Heightmap.Type> heightMapTypes,
       ChunkStatus.ChunkType chunkType,
       ChunkStatus.GenerationTask generationTask,
       ChunkStatus.LoadTask loadTask
    ) {
-      this.previous = arg == null ? this : arg;
+      this.previous = previous == null ? this : previous;
       this.generationTask = generationTask;
       this.loadTask = loadTask;
       this.taskMargin = taskMargin;
-      this.f_ulnfzeqc = bl;
+      this.hasLoadDependencies = hasLoadDependencies;
       this.chunkType = chunkType;
       this.heightMapTypes = heightMapTypes;
-      this.index = arg == null ? 0 : arg.getIndex() + 1;
+      this.index = previous == null ? 0 : previous.getIndex() + 1;
    }
 
    /**
@@ -508,17 +517,19 @@
    public CompletableFuture<Either<Chunk, ChunkHolder.Unloaded>> runGenerationTask(
       Executor executor,
       ServerWorld world,
-      ChunkGenerator arg2,
-      StructureTemplateManager arg3,
+      ChunkGenerator generator,
+      StructureTemplateManager structureTemplateManager,
       ServerLightingProvider lightingProvider,
-      Function<Chunk, CompletableFuture<Either<Chunk, ChunkHolder.Unloaded>>> function,
-      List<Chunk> list
+      Function<Chunk, CompletableFuture<Either<Chunk, ChunkHolder.Unloaded>>> chunkConverter,
+      List<Chunk> chunks
    ) {
-      Chunk lv = (Chunk)list.get(list.size() / 2);
+      Chunk lv = (Chunk)chunks.get(chunks.size() / 2);
       ProfiledDuration lv2 = JvmProfiler.INSTANCE.onChunkGenerate(lv.getPos(), world.getRegistryKey(), this.toString());
-      return this.generationTask.doWork(this, executor, world, arg2, arg3, lightingProvider, function, list, lv).thenApply(either -> {
-         either.ifLeft(argx -> {
-            if (argx instanceof ProtoChunk lvx && !lvx.getStatus().isAtLeast(this)) {
+      return this.generationTask
+         .doWork(this, executor, world, generator, structureTemplateManager, lightingProvider, chunkConverter, chunks, lv)
+         .thenApply(newChunk -> {
+            newChunk.ifLeft(chunk -> {
+               if (chunk instanceof ProtoChunk lvx && !lvx.getStatus().isAtLeast(this)) {
                lvx.setStatus(this);
             }
          });
@@ -526,7 +537,7 @@
             lv2.finish();
          }
 
-         return either;
+            return newChunk;
       });
    }
 
@@ -536,12 +547,12 @@
     */
    public CompletableFuture<Either<Chunk, ChunkHolder.Unloaded>> runLoadTask(
       ServerWorld world,
-      StructureTemplateManager arg2,
+      StructureTemplateManager structureTemplateManager,
       ServerLightingProvider lightingProvider,
-      Function<Chunk, CompletableFuture<Either<Chunk, ChunkHolder.Unloaded>>> function,
+      Function<Chunk, CompletableFuture<Either<Chunk, ChunkHolder.Unloaded>>> chunkConverter,
       Chunk chunk
    ) {
-      return this.loadTask.doWork(this, world, arg2, lightingProvider, function, chunk);
+      return this.loadTask.doWork(this, world, structureTemplateManager, lightingProvider, chunkConverter, chunk);
    }
 
    /**
@@ -553,10 +564,11 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_lolpswyr Lnet/minecraft/unmapped/C_kogtzhzt;m_lolpswyr()Z}
+    * @mapping {@literal named hasLoadDependencies Lnet/minecraft/world/chunk/ChunkStatus;hasLoadDependencies()Z}
     */
-   public boolean m_lolpswyr() {
-      return this.f_ulnfzeqc;
+   public boolean hasLoadDependencies() {
+      return this.hasLoadDependencies;
    }
 
    /**
@@ -633,15 +645,15 @@
        * @mapping {@literal named doWork Lnet/minecraft/world/chunk/ChunkStatus$GenerationTask;doWork(Lnet/minecraft/world/chunk/ChunkStatus;Ljava/util/concurrent/Executor;Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/world/gen/chunk/ChunkGenerator;Lnet/minecraft/structure/StructureTemplateManager;Lnet/minecraft/server/world/ServerLightingProvider;Ljava/util/function/Function;Ljava/util/List;Lnet/minecraft/world/chunk/Chunk;)Ljava/util/concurrent/CompletableFuture;}
        */
       CompletableFuture<Either<Chunk, ChunkHolder.Unloaded>> doWork(
-         ChunkStatus arg,
+         ChunkStatus status,
          Executor executor,
          ServerWorld world,
-         ChunkGenerator arg3,
-         StructureTemplateManager arg4,
-         ServerLightingProvider arg5,
-         Function<Chunk, CompletableFuture<Either<Chunk, ChunkHolder.Unloaded>>> function,
-         List<Chunk> list,
-         Chunk arg6
+         ChunkGenerator generator,
+         StructureTemplateManager structureTemplateManager,
+         ServerLightingProvider lightingProvider,
+         Function<Chunk, CompletableFuture<Either<Chunk, ChunkHolder.Unloaded>>> chunkConverter,
+         List<Chunk> chunks,
+         Chunk chunk
       );
    }
 
@@ -657,12 +669,12 @@
        * @mapping {@literal named doWork Lnet/minecraft/world/chunk/ChunkStatus$LoadTask;doWork(Lnet/minecraft/world/chunk/ChunkStatus;Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/structure/StructureTemplateManager;Lnet/minecraft/server/world/ServerLightingProvider;Ljava/util/function/Function;Lnet/minecraft/world/chunk/Chunk;)Ljava/util/concurrent/CompletableFuture;}
        */
       CompletableFuture<Either<Chunk, ChunkHolder.Unloaded>> doWork(
-         ChunkStatus arg,
+         ChunkStatus status,
          ServerWorld world,
-         StructureTemplateManager arg3,
-         ServerLightingProvider arg4,
-         Function<Chunk, CompletableFuture<Either<Chunk, ChunkHolder.Unloaded>>> function,
-         Chunk arg5
+         StructureTemplateManager structureTemplateManager,
+         ServerLightingProvider lightingProvider,
+         Function<Chunk, CompletableFuture<Either<Chunk, ChunkHolder.Unloaded>>> chunkConverter,
+         Chunk chunk
       );
    }
 
@@ -672,14 +684,13 @@
     */
    interface SimpleGenerationTask extends ChunkStatus.GenerationTask {
       /**
-       * @mapping {@literal hashed doWork Lnet/minecraft/unmapped/C_kogtzhzt$C_wpsejfkz;doWork(Lnet/minecraft/unmapped/C_kogtzhzt;Ljava/util/concurrent/Executor;Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_kgfalbim;Lnet/minecraft/unmapped/C_zxhjfyir;Lnet/minecraft/unmapped/C_bdzdhzyc;Ljava/util/function/Function;Ljava/util/List;Lnet/minecraft/unmapped/C_lwzmmmqr;)Ljava/util/concurrent/CompletableFuture;}
-       * @mapping {@literal named doWork Lnet/minecraft/world/chunk/ChunkStatus$SimpleGenerationTask;doWork(Lnet/minecraft/world/chunk/ChunkStatus;Ljava/util/concurrent/Executor;Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/world/gen/chunk/ChunkGenerator;Lnet/minecraft/structure/StructureTemplateManager;Lnet/minecraft/server/world/ServerLightingProvider;Ljava/util/function/Function;Ljava/util/List;Lnet/minecraft/world/chunk/Chunk;)Ljava/util/concurrent/CompletableFuture;}
+       * Mapping not found
        */
       @Override
       default CompletableFuture<Either<Chunk, ChunkHolder.Unloaded>> doWork(
          ChunkStatus arg,
          Executor executor,
-         ServerWorld world,
+         ServerWorld arg2,
          ChunkGenerator arg3,
          StructureTemplateManager arg4,
          ServerLightingProvider arg5,
@@ -687,7 +698,7 @@
          List<Chunk> list,
          Chunk arg6
       ) {
-         this.doWork(arg, world, arg3, list, arg6);
+         this.doWork(arg, arg2, arg3, list, arg6);
          return CompletableFuture.completedFuture(Either.left(arg6));
       }
 
diff -bur namedTargetSrc/net/minecraft/world/chunk/ChunkTickTracker.java namedSrc/net/minecraft/world/chunk/ChunkTickTracker.java
--- namedTargetSrc/net/minecraft/world/chunk/ChunkTickTracker.java	2023-07-05 00:15:56.885584200 +0000
+++ namedSrc/net/minecraft/world/chunk/ChunkTickTracker.java	2023-07-05 00:14:07.675712738 +0000
@@ -20,9 +20,10 @@
  */
 public class ChunkTickTracker extends ChunkPosDistanceLevelPropagator {
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_gudckaft Lnet/minecraft/unmapped/C_dnmsfwrb;f_gudckaft:I}
+    * @mapping {@literal named MAX_LEVEL Lnet/minecraft/world/chunk/ChunkTickTracker;MAX_LEVEL:I}
     */
-   public static final int f_gudckaft = 33;
+   public static final int MAX_LEVEL = 33;
    /**
     * @mapping {@literal hashed f_iwymjqnj Lnet/minecraft/unmapped/C_dnmsfwrb;f_iwymjqnj:I}
     * @mapping {@literal named INITIAL_TICKET_LIST_CAPACITY Lnet/minecraft/world/chunk/ChunkTickTracker;INITIAL_TICKET_LIST_CAPACITY:I}
@@ -52,7 +53,7 @@
     * @mapping {@literal named getTickets Lnet/minecraft/world/chunk/ChunkTickTracker;getTickets(J)Lnet/minecraft/util/collection/SortedArraySet;}
     */
    private SortedArraySet<ChunkTicket<?>> getTickets(long targetId) {
-      return this.tickets.computeIfAbsent(targetId, (Long2ObjectFunction<? extends SortedArraySet<ChunkTicket<?>>>)(l -> SortedArraySet.create(4)));
+      return this.tickets.computeIfAbsent(targetId, (Long2ObjectFunction<? extends SortedArraySet<ChunkTicket<?>>>)(key -> SortedArraySet.create(4)));
    }
 
    /**
@@ -111,7 +112,7 @@
     * @mapping {@literal hashed m_wkyzmnqw Lnet/minecraft/unmapped/C_dnmsfwrb;m_wkyzmnqw(I)V}
     * @mapping {@literal named replacePlayerTicketLevel Lnet/minecraft/world/chunk/ChunkTickTracker;replacePlayerTicketLevel(I)V}
     */
-   public void replacePlayerTicketLevel(int i) {
+   public void replacePlayerTicketLevel(int level) {
       List<Pair<ChunkTicket<ChunkPos>, Long>> list = new ArrayList();
 
       for (Entry<SortedArraySet<ChunkTicket<?>>> entry : this.tickets.long2ObjectEntrySet()) {
@@ -128,7 +129,7 @@
          this.removeTicket(lv2, lv3);
          ChunkPos lv4 = new ChunkPos(lv2);
          ChunkTicketType<ChunkPos> lv5 = lv3.getType();
-         this.addTicket(lv5, lv4, i, lv4);
+         this.addTicket(lv5, lv4, level, lv4);
       }
    }
 
diff -bur namedTargetSrc/net/minecraft/world/chunk/ProtoChunk.java namedSrc/net/minecraft/world/chunk/ProtoChunk.java
--- namedTargetSrc/net/minecraft/world/chunk/ProtoChunk.java	2023-07-05 00:15:56.905584530 +0000
+++ namedSrc/net/minecraft/world/chunk/ProtoChunk.java	2023-07-05 00:14:07.695713099 +0000
@@ -186,7 +186,7 @@
                }
 
                if (ChunkLightProvider.needsLightUpdate(this, pos, lv2, state)) {
-                  this.f_tvmxdtur.update(this, m, j, o);
+                  this.skyLightSources.update(this, m, j, o);
                   this.lightingProvider.checkBlock(pos);
                }
             }
@@ -316,7 +316,7 @@
     */
    @Override
    public Holder<Biome> getNoiseBiome(int i, int j, int k) {
-      if (this.m_edeniyps().isAtLeast(ChunkStatus.BIOMES)) {
+      if (this.getHighestChunkStatus().isAtLeast(ChunkStatus.BIOMES)) {
          return super.getNoiseBiome(i, j, k);
       } else {
          throw new IllegalStateException("Asking for biomes before we have biomes");
diff -bur namedTargetSrc/net/minecraft/world/chunk/UpgradeData.java namedSrc/net/minecraft/world/chunk/UpgradeData.java
--- namedTargetSrc/net/minecraft/world/chunk/UpgradeData.java	2023-07-05 00:15:56.897584398 +0000
+++ namedSrc/net/minecraft/world/chunk/UpgradeData.java	2023-07-05 00:14:07.687712955 +0000
@@ -144,10 +144,10 @@
     * @mapping {@literal hashed m_lgjvkkag Lnet/minecraft/unmapped/C_jrivgvxn;m_lgjvkkag(Lnet/minecraft/unmapped/C_hhlwcnih;Ljava/lang/String;Ljava/util/function/Function;Ljava/util/List;)V}
     * @mapping {@literal named loadTicks Lnet/minecraft/world/chunk/UpgradeData;loadTicks(Lnet/minecraft/nbt/NbtCompound;Ljava/lang/String;Ljava/util/function/Function;Ljava/util/List;)V}
     */
-   private static <T> void loadTicks(NbtCompound nbt, String key, Function<String, Optional<T>> function, List<Tick<T>> ticks) {
+   private static <T> void loadTicks(NbtCompound nbt, String key, Function<String, Optional<T>> identifierToType, List<Tick<T>> ticks) {
       if (nbt.contains(key, NbtElement.LIST_TYPE)) {
          for (NbtElement lv2 : nbt.getList(key, NbtElement.COMPOUND_TYPE)) {
-            Tick.fromNbt((NbtCompound)lv2, function).ifPresent(ticks::add);
+            Tick.fromNbt((NbtCompound)lv2, identifierToType).ifPresent(ticks::add);
          }
       }
    }
@@ -312,13 +312,13 @@
       lv.putByte("Sides", (byte)j);
       if (!this.neighborBlockTicks.isEmpty()) {
          NbtList lv4 = new NbtList();
-         this.neighborBlockTicks.forEach(arg2 -> lv4.add(arg2.toNbt(block -> Registries.BLOCK.getId(block).toString())));
+         this.neighborBlockTicks.forEach(tick -> lv4.add(tick.toNbt(block -> Registries.BLOCK.getId(block).toString())));
          lv.put("neighbor_block_ticks", lv4);
       }
 
       if (!this.neighborFluidTicks.isEmpty()) {
          NbtList lv5 = new NbtList();
-         this.neighborFluidTicks.forEach(arg2 -> lv5.add(arg2.toNbt(argx -> Registries.FLUID.getId(argx).toString())));
+         this.neighborFluidTicks.forEach(tick -> lv5.add(tick.toNbt(fluid -> Registries.FLUID.getId(fluid).toString())));
          lv.put("neighbor_fluid_ticks", lv5);
       }
 
@@ -390,8 +390,10 @@
           * Mapping not found
           */
          @Override
-         public BlockState getUpdatedState(BlockState arg, Direction direction, BlockState arg3, WorldAccess world, BlockPos arg5, BlockPos arg6) {
-            return arg;
+         public BlockState getUpdatedState(
+            BlockState oldState, Direction direction, BlockState otherState, WorldAccess world, BlockPos currentPos, BlockPos otherPos
+         ) {
+            return oldState;
          }
       },
       /**
@@ -403,8 +405,10 @@
           * Mapping not found
           */
          @Override
-         public BlockState getUpdatedState(BlockState arg, Direction direction, BlockState arg3, WorldAccess world, BlockPos arg5, BlockPos arg6) {
-            return arg.getStateForNeighborUpdate(direction, world.getBlockState(arg6), world, arg5, arg6);
+         public BlockState getUpdatedState(
+            BlockState oldState, Direction direction, BlockState otherState, WorldAccess world, BlockPos currentPos, BlockPos otherPos
+         ) {
+            return oldState.getStateForNeighborUpdate(direction, world.getBlockState(otherPos), world, currentPos, otherPos);
          }
       },
       /**
@@ -416,28 +420,30 @@
           * Mapping not found
           */
          @Override
-         public BlockState getUpdatedState(BlockState arg, Direction direction, BlockState arg3, WorldAccess world, BlockPos arg5, BlockPos arg6) {
-            if (arg3.isOf(arg.getBlock())
+         public BlockState getUpdatedState(
+            BlockState oldState, Direction direction, BlockState otherState, WorldAccess world, BlockPos currentPos, BlockPos otherPos
+         ) {
+            if (otherState.isOf(oldState.getBlock())
                && direction.getAxis().isHorizontal()
-               && arg.get(ChestBlock.CHEST_TYPE) == ChestType.SINGLE
-               && arg3.get(ChestBlock.CHEST_TYPE) == ChestType.SINGLE) {
-               Direction lv = arg.get(ChestBlock.FACING);
-               if (direction.getAxis() != lv.getAxis() && lv == arg3.get(ChestBlock.FACING)) {
+               && oldState.get(ChestBlock.CHEST_TYPE) == ChestType.SINGLE
+               && otherState.get(ChestBlock.CHEST_TYPE) == ChestType.SINGLE) {
+               Direction lv = oldState.get(ChestBlock.FACING);
+               if (direction.getAxis() != lv.getAxis() && lv == otherState.get(ChestBlock.FACING)) {
                   ChestType lv2 = direction == lv.rotateYClockwise() ? ChestType.LEFT : ChestType.RIGHT;
-                  world.setBlockState(arg6, arg3.with(ChestBlock.CHEST_TYPE, lv2.getOpposite()), Block.NOTIFY_LISTENERS | Block.FORCE_STATE);
+                  world.setBlockState(otherPos, otherState.with(ChestBlock.CHEST_TYPE, lv2.getOpposite()), Block.NOTIFY_LISTENERS | Block.FORCE_STATE);
                   if (lv == Direction.NORTH || lv == Direction.EAST) {
-                     BlockEntity lv3 = world.getBlockEntity(arg5);
-                     BlockEntity lv4 = world.getBlockEntity(arg6);
+                     BlockEntity lv3 = world.getBlockEntity(currentPos);
+                     BlockEntity lv4 = world.getBlockEntity(otherPos);
                      if (lv3 instanceof ChestBlockEntity && lv4 instanceof ChestBlockEntity) {
                         ChestBlockEntity.copyInventory((ChestBlockEntity)lv3, (ChestBlockEntity)lv4);
                      }
                   }
 
-                  return arg.with(ChestBlock.CHEST_TYPE, lv2);
+                  return oldState.with(ChestBlock.CHEST_TYPE, lv2);
                }
             }
 
-            return arg;
+            return oldState;
          }
       },
       /**
@@ -464,9 +470,11 @@
           * Mapping not found
           */
          @Override
-         public BlockState getUpdatedState(BlockState arg, Direction direction, BlockState arg3, WorldAccess world, BlockPos arg5, BlockPos arg6) {
-            BlockState lv = arg.getStateForNeighborUpdate(direction, world.getBlockState(arg6), world, arg5, arg6);
-            if (arg != lv) {
+         public BlockState getUpdatedState(
+            BlockState oldState, Direction direction, BlockState otherState, WorldAccess world, BlockPos currentPos, BlockPos otherPos
+         ) {
+            BlockState lv = oldState.getStateForNeighborUpdate(direction, world.getBlockState(otherPos), world, currentPos, otherPos);
+            if (oldState != lv) {
                int i = lv.get(Properties.DISTANCE_1_7);
                List<ObjectSet<BlockPos>> list = (List)this.distanceToPositions.get();
                if (list.isEmpty()) {
@@ -475,10 +483,10 @@
                   }
                }
 
-               ((ObjectSet)list.get(i)).add(arg5.toImmutable());
+               ((ObjectSet)list.get(i)).add(currentPos.toImmutable());
             }
 
-            return arg;
+            return oldState;
          }
 
          /**
@@ -523,15 +531,17 @@
           * Mapping not found
           */
          @Override
-         public BlockState getUpdatedState(BlockState arg, Direction direction, BlockState arg3, WorldAccess world, BlockPos arg5, BlockPos arg6) {
-            if (arg.get(StemBlock.AGE) == 7) {
-               GourdBlock lv = ((StemBlock)arg.getBlock()).getGourdBlock();
-               if (arg3.isOf(lv)) {
+         public BlockState getUpdatedState(
+            BlockState oldState, Direction direction, BlockState otherState, WorldAccess world, BlockPos currentPos, BlockPos otherPos
+         ) {
+            if (oldState.get(StemBlock.AGE) == 7) {
+               GourdBlock lv = ((StemBlock)oldState.getBlock()).getGourdBlock();
+               if (otherState.isOf(lv)) {
                   return lv.getAttachedStem().getDefaultState().with(HorizontalFacingBlock.FACING, direction);
                }
             }
 
-            return arg;
+            return oldState;
          }
       };
 
@@ -553,12 +563,12 @@
        * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_jrivgvxn$C_zmvhiflf;<init>(Ljava/lang/String;IZ[Lnet/minecraft/unmapped/C_mmxmpdoq;)V}
        * @mapping {@literal named <init> Lnet/minecraft/world/chunk/UpgradeData$BuiltinLogic;<init>(Ljava/lang/String;IZ[Lnet/minecraft/block/Block;)V}
        */
-      BuiltinLogic(boolean bl, Block... blocks) {
+      BuiltinLogic(boolean addToCallbackLogics, Block... blocks) {
          for (Block lv : blocks) {
             UpgradeData.BLOCK_TO_LOGIC.put(lv, this);
          }
 
-         if (bl) {
+         if (addToCallbackLogics) {
             UpgradeData.CALLBACK_LOGICS.add(this);
          }
       }
@@ -573,7 +583,7 @@
        * @mapping {@literal hashed m_lgbggwsd Lnet/minecraft/unmapped/C_jrivgvxn$C_ecvoyrmp;m_lgbggwsd(Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_xpuuihxf;Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_vdvbsyle;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_hynzadkk;)Lnet/minecraft/unmapped/C_txtbiemp;}
        * @mapping {@literal named getUpdatedState Lnet/minecraft/world/chunk/UpgradeData$Logic;getUpdatedState(Lnet/minecraft/block/BlockState;Lnet/minecraft/util/math/Direction;Lnet/minecraft/block/BlockState;Lnet/minecraft/world/WorldAccess;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/util/math/BlockPos;)Lnet/minecraft/block/BlockState;}
        */
-      BlockState getUpdatedState(BlockState arg, Direction direction, BlockState arg3, WorldAccess world, BlockPos arg5, BlockPos arg6);
+      BlockState getUpdatedState(BlockState oldState, Direction direction, BlockState otherState, WorldAccess world, BlockPos currentPos, BlockPos otherPos);
 
       /**
        * @mapping {@literal hashed m_ppzgkpxh Lnet/minecraft/unmapped/C_jrivgvxn$C_ecvoyrmp;m_ppzgkpxh(Lnet/minecraft/unmapped/C_vdvbsyle;)V}

github-actions · 2023-07-05T00:16:00Z

View the diff here (2/3):

diff -bur namedTargetSrc/net/minecraft/world/chunk/WorldChunk.java namedSrc/net/minecraft/world/chunk/WorldChunk.java
--- namedTargetSrc/net/minecraft/world/chunk/WorldChunk.java	2023-07-05 00:15:56.837583407 +0000
+++ namedSrc/net/minecraft/world/chunk/WorldChunk.java	2023-07-05 00:14:07.615711657 +0000
@@ -125,9 +125,10 @@
    @Nullable
    private WorldChunk.PostLoadProcessor loadToWorldConsumer;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_yphcwwhv Lnet/minecraft/unmapped/C_hrdsvlkq;f_yphcwwhv:Lit/unimi/dsi/fastutil/ints/Int2ObjectMap;}
+    * @mapping {@literal named gameEventListenerRegistries Lnet/minecraft/world/chunk/WorldChunk;gameEventListenerRegistries:Lit/unimi/dsi/fastutil/ints/Int2ObjectMap;}
     */
-   private final Int2ObjectMap<GameEventListenerRegistry> f_yphcwwhv;
+   private final Int2ObjectMap<GameEventListenerRegistry> gameEventListenerRegistries;
    /**
     * @mapping {@literal hashed f_dyxtvrkw Lnet/minecraft/unmapped/C_hrdsvlkq;f_dyxtvrkw:Lnet/minecraft/unmapped/C_vzzkwuje;}
     * @mapping {@literal named blockTickScheduler Lnet/minecraft/world/chunk/WorldChunk;blockTickScheduler:Lnet/minecraft/world/tick/ChunkTickScheduler;}
@@ -164,7 +165,7 @@
    ) {
       super(pos, upgradeData, world, world.getRegistryManager().get(RegistryKeys.BIOME), inhabitedTime, sectionArrayInitializer, blendingData);
       this.world = world;
-      this.f_yphcwwhv = new Int2ObjectOpenHashMap<>();
+      this.gameEventListenerRegistries = new Int2ObjectOpenHashMap<>();
 
       for (Heightmap.Type lv : Heightmap.Type.values()) {
          if (ChunkStatus.FULL.getHeightmapTypes().contains(lv)) {
@@ -213,7 +214,7 @@
          }
       }
 
-      this.f_tvmxdtur = protoChunk.f_tvmxdtur;
+      this.skyLightSources = protoChunk.skyLightSources;
       this.setLightCorrect(protoChunk.isLightCorrect());
       this.needsSaving = true;
    }
@@ -249,7 +250,7 @@
    public GameEventListenerRegistry getListenerRegistry(int sectionY) {
       World var3 = this.world;
       return var3 instanceof ServerWorld lv
-         ? this.f_yphcwwhv
+         ? this.gameEventListenerRegistries
             .computeIfAbsent(sectionY, (Int2ObjectFunction<? extends GameEventListenerRegistry>)(j -> new C_drmyhwfj(lv, sectionY, this::m_uzpphvzl)))
          : super.getListenerRegistry(sectionY);
    }
@@ -356,7 +357,7 @@
             if (ChunkLightProvider.needsLightUpdate(this, pos, lv2, state)) {
                Profiler lv4 = this.world.getProfiler();
                lv4.push("updateSkyLightSources");
-               this.f_tvmxdtur.update(this, j, i, l);
+               this.skyLightSources.update(this, j, i, l);
                lv4.swap("queueCheckLight");
                this.world.getChunkManager().getLightingProvider().checkBlock(pos);
                lv4.pop();
@@ -574,7 +575,7 @@
     * Mapping not found
     */
    private void m_uzpphvzl(int i) {
-      this.f_yphcwwhv.remove(i);
+      this.gameEventListenerRegistries.remove(i);
    }
 
    /**
@@ -625,7 +626,7 @@
          }
       }
 
-      this.m_ymukudgt();
+      this.fillSkyLightSources();
       consumer.accept((ChunkData.BlockEntityVisitor)(pos, arg2, arg3) -> {
          BlockEntity lv = this.getBlockEntity(pos, WorldChunk.CreationType.IMMEDIATE);
          if (lv != null && arg3 != null && lv.getType() == arg2) {
diff -bur namedTargetSrc/net/minecraft/world/chunk/WrapperProtoChunk.java namedSrc/net/minecraft/world/chunk/WrapperProtoChunk.java
--- namedTargetSrc/net/minecraft/world/chunk/WrapperProtoChunk.java	2023-07-05 00:15:56.933584992 +0000
+++ namedSrc/net/minecraft/world/chunk/WrapperProtoChunk.java	2023-07-05 00:14:07.727713675 +0000
@@ -329,8 +329,8 @@
     * Mapping not found
     */
    @Override
-   public void m_mfgzazfz(Predicate<BlockState> predicate, BiConsumer<BlockPos, BlockState> biConsumer) {
-      this.wrapped.m_mfgzazfz(predicate, biConsumer);
+   public void forEachMatch(Predicate<BlockState> predicate, BiConsumer<BlockPos, BlockState> consumer) {
+      this.wrapped.forEachMatch(predicate, consumer);
    }
 
    /**
@@ -436,8 +436,8 @@
     * Mapping not found
     */
    @Override
-   public void m_ymukudgt() {
-      this.wrapped.m_ymukudgt();
+   public void fillSkyLightSources() {
+      this.wrapped.fillSkyLightSources();
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/world/CommandBlockExecutor.java namedSrc/net/minecraft/world/CommandBlockExecutor.java
--- namedTargetSrc/net/minecraft/world/CommandBlockExecutor.java	2023-07-05 00:15:56.789582614 +0000
+++ namedSrc/net/minecraft/world/CommandBlockExecutor.java	2023-07-05 00:14:07.535710216 +0000
@@ -339,7 +339,8 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_xsgoevxf Lnet/minecraft/unmapped/C_ufmydvnm;m_xsgoevxf()Z}
+    * @mapping {@literal named isValid Lnet/minecraft/world/CommandBlockExecutor;isValid()Z}
     */
-   public abstract boolean m_xsgoevxf();
+   public abstract boolean isValid();
 }
diff -bur namedTargetSrc/net/minecraft/world/dimension/AreaHelper.java namedSrc/net/minecraft/world/dimension/AreaHelper.java
--- namedTargetSrc/net/minecraft/world/dimension/AreaHelper.java	2023-07-05 00:15:56.873584001 +0000
+++ namedSrc/net/minecraft/world/dimension/AreaHelper.java	2023-07-05 00:14:07.663712522 +0000
@@ -30,34 +30,40 @@
  */
 public class AreaHelper {
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_rmlfmqaw Lnet/minecraft/unmapped/C_roraysyx;f_rmlfmqaw:I}
+    * @mapping {@literal named MIN_WIDTH Lnet/minecraft/world/dimension/AreaHelper;MIN_WIDTH:I}
     */
-   private static final int f_rmlfmqaw = 2;
+   private static final int MIN_WIDTH = 2;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_yjpwcxth Lnet/minecraft/unmapped/C_roraysyx;f_yjpwcxth:I}
+    * @mapping {@literal named MAX_WIDTH Lnet/minecraft/world/dimension/AreaHelper;MAX_WIDTH:I}
     */
-   public static final int f_yjpwcxth = 21;
+   public static final int MAX_WIDTH = 21;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_zcaohfhf Lnet/minecraft/unmapped/C_roraysyx;f_zcaohfhf:I}
+    * @mapping {@literal named MIN_HEIGHT Lnet/minecraft/world/dimension/AreaHelper;MIN_HEIGHT:I}
     */
-   private static final int f_zcaohfhf = 3;
+   private static final int MIN_HEIGHT = 3;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_idqfohso Lnet/minecraft/unmapped/C_roraysyx;f_idqfohso:I}
+    * @mapping {@literal named MAX_HEIGHT Lnet/minecraft/world/dimension/AreaHelper;MAX_HEIGHT:I}
     */
-   public static final int f_idqfohso = 21;
+   public static final int MAX_HEIGHT = 21;
    /**
     * @mapping {@literal hashed f_ystwyyzs Lnet/minecraft/unmapped/C_roraysyx;f_ystwyyzs:Lnet/minecraft/unmapped/C_triydqro$C_izsedryc;}
     * @mapping {@literal named IS_VALID_FRAME_BLOCK Lnet/minecraft/world/dimension/AreaHelper;IS_VALID_FRAME_BLOCK:Lnet/minecraft/block/AbstractBlock$ContextPredicate;}
     */
    private static final AbstractBlock.ContextPredicate IS_VALID_FRAME_BLOCK = (state, world, pos) -> state.isOf(Blocks.OBSIDIAN);
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_abcqscxw Lnet/minecraft/unmapped/C_roraysyx;f_abcqscxw:F}
+    * @mapping {@literal named MAX_SAFE_ENTITY_XY Lnet/minecraft/world/dimension/AreaHelper;MAX_SAFE_ENTITY_XY:F}
     */
-   private static final float f_abcqscxw = 4.0F;
+   private static final float MAX_SAFE_ENTITY_XY = 4.0F;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_hhtarqlp Lnet/minecraft/unmapped/C_roraysyx;f_hhtarqlp:D}
+    * @mapping {@literal named MAX_VERTICAL_TRAVEL_DELTA Lnet/minecraft/world/dimension/AreaHelper;MAX_VERTICAL_TRAVEL_DELTA:D}
     */
-   private static final double f_hhtarqlp = 1.0;
+   private static final double MAX_VERTICAL_TRAVEL_DELTA = 1.0;
    /**
     * @mapping {@literal hashed f_jjtwimrs Lnet/minecraft/unmapped/C_roraysyx;f_jjtwimrs:Lnet/minecraft/unmapped/C_vdvbsyle;}
     * @mapping {@literal named world Lnet/minecraft/world/dimension/AreaHelper;world:Lnet/minecraft/world/WorldAccess;}
@@ -100,7 +106,7 @@
     * @mapping {@literal named getNewPortal Lnet/minecraft/world/dimension/AreaHelper;getNewPortal(Lnet/minecraft/world/WorldAccess;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/util/math/Direction$Axis;)Ljava/util/Optional;}
     */
    public static Optional<AreaHelper> getNewPortal(WorldAccess world, BlockPos pos, Direction.Axis axis) {
-      return getOrEmpty(world, pos, arg -> arg.isValid() && arg.foundPortalBlocks == 0, axis);
+      return getOrEmpty(world, pos, helper -> helper.isValid() && helper.foundPortalBlocks == 0, axis);
    }
 
    /**
@@ -196,17 +202,17 @@
     */
    private int getHeight() {
       BlockPos.Mutable lv = new BlockPos.Mutable();
-      int i = this.m_fqjhrxgm(lv);
-      return i >= 3 && i <= 21 && this.m_beqllhzk(lv, i) ? i : 0;
+      int i = this.getPotentialHeight(lv);
+      return i >= 3 && i <= 21 && this.hasTopFrame(lv, i) ? i : 0;
    }
 
    /**
     * @mapping {@literal hashed m_beqllhzk Lnet/minecraft/unmapped/C_roraysyx;m_beqllhzk(Lnet/minecraft/unmapped/C_hynzadkk$C_egqitdjk;I)Z}
-    * @mapping {@literal named m_beqllhzk Lnet/minecraft/world/dimension/AreaHelper;m_beqllhzk(Lnet/minecraft/util/math/BlockPos$Mutable;I)Z}
+    * @mapping {@literal named hasTopFrame Lnet/minecraft/world/dimension/AreaHelper;hasTopFrame(Lnet/minecraft/util/math/BlockPos$Mutable;I)Z}
     */
-   private boolean m_beqllhzk(BlockPos.Mutable pos, int i) {
+   private boolean hasTopFrame(BlockPos.Mutable pos, int height) {
       for (int j = 0; j < this.width; ++j) {
-         BlockPos.Mutable lv = pos.set(this.lowerCorner).move(Direction.UP, i).move(this.negativeDir, j);
+         BlockPos.Mutable lv = pos.set(this.lowerCorner).move(Direction.UP, height).move(this.negativeDir, j);
          if (!IS_VALID_FRAME_BLOCK.test(this.world.getBlockState(lv), this.world, lv)) {
             return false;
          }
@@ -217,9 +223,9 @@
 
    /**
     * @mapping {@literal hashed m_fqjhrxgm Lnet/minecraft/unmapped/C_roraysyx;m_fqjhrxgm(Lnet/minecraft/unmapped/C_hynzadkk$C_egqitdjk;)I}
-    * @mapping {@literal named m_fqjhrxgm Lnet/minecraft/world/dimension/AreaHelper;m_fqjhrxgm(Lnet/minecraft/util/math/BlockPos$Mutable;)I}
+    * @mapping {@literal named getPotentialHeight Lnet/minecraft/world/dimension/AreaHelper;getPotentialHeight(Lnet/minecraft/util/math/BlockPos$Mutable;)I}
     */
-   private int m_fqjhrxgm(BlockPos.Mutable pos) {
+   private int getPotentialHeight(BlockPos.Mutable pos) {
       for (int i = 0; i < 21; ++i) {
          pos.set(this.lowerCorner).move(Direction.UP, i).move(this.negativeDir, -1);
          if (!IS_VALID_FRAME_BLOCK.test(this.world.getBlockState(pos), this.world, pos)) {
@@ -341,24 +347,24 @@
       double k = 0.5 + offset.getZ();
       boolean bl = lv3 == Direction.Axis.X;
       Vec3d lv6 = new Vec3d((double)lv.getX() + (bl ? h : k), (double)lv.getY() + j, (double)lv.getZ() + (bl ? k : h));
-      Vec3d lv7 = m_jbhuyvuh(lv6, destination, entity, lv4);
+      Vec3d lv7 = findOpenPosition(lv6, destination, entity, lv4);
       return new TeleportTarget(lv7, lv5, yaw + (float)i, pitch);
    }
 
    /**
     * @mapping {@literal hashed m_jbhuyvuh Lnet/minecraft/unmapped/C_roraysyx;m_jbhuyvuh(Lnet/minecraft/unmapped/C_vgpupfxx;Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_sszpscpo;)Lnet/minecraft/unmapped/C_vgpupfxx;}
-    * @mapping {@literal named m_jbhuyvuh Lnet/minecraft/world/dimension/AreaHelper;m_jbhuyvuh(Lnet/minecraft/util/math/Vec3d;Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/entity/Entity;Lnet/minecraft/entity/EntityDimensions;)Lnet/minecraft/util/math/Vec3d;}
+    * @mapping {@literal named findOpenPosition Lnet/minecraft/world/dimension/AreaHelper;findOpenPosition(Lnet/minecraft/util/math/Vec3d;Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/entity/Entity;Lnet/minecraft/entity/EntityDimensions;)Lnet/minecraft/util/math/Vec3d;}
     */
-   private static Vec3d m_jbhuyvuh(Vec3d arg, ServerWorld world, Entity entity, EntityDimensions dimensions) {
+   private static Vec3d findOpenPosition(Vec3d fallback, ServerWorld world, Entity entity, EntityDimensions dimensions) {
       if (!(dimensions.width > 4.0F) && !(dimensions.height > 4.0F)) {
          double d = (double)dimensions.height / 2.0;
-         Vec3d lv = arg.add(0.0, d, 0.0);
+         Vec3d lv = fallback.add(0.0, d, 0.0);
          VoxelShape lv2 = VoxelShapes.cuboid(Box.of(lv, (double)dimensions.width, 0.0, (double)dimensions.width).stretch(0.0, 1.0, 0.0).expand(1.0E-6));
          Optional<Vec3d> optional = world.findClosestCollision(entity, lv2, lv, (double)dimensions.width, (double)dimensions.height, (double)dimensions.width);
-         Optional<Vec3d> optional2 = optional.map(argx -> argx.subtract(0.0, d, 0.0));
-         return (Vec3d)optional2.orElse(arg);
+         Optional<Vec3d> optional2 = optional.map(pos -> pos.subtract(0.0, d, 0.0));
+         return (Vec3d)optional2.orElse(fallback);
       } else {
-         return arg;
+         return fallback;
       }
    }
 }
diff -bur namedTargetSrc/net/minecraft/world/entity/EntityTrackingSection.java namedSrc/net/minecraft/world/entity/EntityTrackingSection.java
--- namedTargetSrc/net/minecraft/world/entity/EntityTrackingSection.java	2023-07-05 00:15:56.829583275 +0000
+++ namedSrc/net/minecraft/world/entity/EntityTrackingSection.java	2023-07-05 00:14:07.587711153 +0000
@@ -46,24 +46,25 @@
     * @mapping {@literal hashed m_vcpluela Lnet/minecraft/unmapped/C_kmnnyhyi;m_vcpluela(Lnet/minecraft/unmapped/C_sncvekqg;)V}
     * @mapping {@literal named add Lnet/minecraft/world/entity/EntityTrackingSection;add(Lnet/minecraft/world/entity/EntityLike;)V}
     */
-   public void add(T arg) {
-      this.collection.add(arg);
+   public void add(T entity) {
+      this.collection.add(entity);
    }
 
    /**
     * @mapping {@literal hashed m_imkspedk Lnet/minecraft/unmapped/C_kmnnyhyi;m_imkspedk(Lnet/minecraft/unmapped/C_sncvekqg;)Z}
     * @mapping {@literal named remove Lnet/minecraft/world/entity/EntityTrackingSection;remove(Lnet/minecraft/world/entity/EntityLike;)Z}
     */
-   public boolean remove(T arg) {
-      return this.collection.remove(arg);
+   public boolean remove(T entity) {
+      return this.collection.remove(entity);
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_xasgejxo Lnet/minecraft/unmapped/C_kmnnyhyi;m_xasgejxo(Lnet/minecraft/unmapped/C_hbcjzgoe;Lnet/minecraft/unmapped/C_gibrwunu;)Lnet/minecraft/unmapped/C_gibrwunu$C_ulnnautc;}
+    * @mapping {@literal named forEachIntersection Lnet/minecraft/world/entity/EntityTrackingSection;forEachIntersection(Lnet/minecraft/util/math/Box;Lnet/minecraft/util/function/AbortableIterationConsumer;)Lnet/minecraft/util/function/AbortableIterationConsumer$IterationStatus;}
     */
-   public AbortableIterationConsumer.IterationStatus m_xasgejxo(Box arg, AbortableIterationConsumer<T> arg2) {
+   public AbortableIterationConsumer.IterationStatus forEachIntersection(Box box, AbortableIterationConsumer<T> consumer) {
       for (T lv : this.collection) {
-         if (lv.getBoundingBox().intersects(arg) && arg2.accept(lv).shouldAbort()) {
+         if (lv.getBoundingBox().intersects(box) && consumer.accept(lv).shouldAbort()) {
             return AbortableIterationConsumer.IterationStatus.ABORT;
          }
       }
@@ -72,16 +73,19 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_dksrxtyd Lnet/minecraft/unmapped/C_kmnnyhyi;m_dksrxtyd(Lnet/minecraft/unmapped/C_ocpldaah;Lnet/minecraft/unmapped/C_hbcjzgoe;Lnet/minecraft/unmapped/C_gibrwunu;)Lnet/minecraft/unmapped/C_gibrwunu$C_ulnnautc;}
+    * @mapping {@literal named forEachIntersection Lnet/minecraft/world/entity/EntityTrackingSection;forEachIntersection(Lnet/minecraft/util/TypeFilter;Lnet/minecraft/util/math/Box;Lnet/minecraft/util/function/AbortableIterationConsumer;)Lnet/minecraft/util/function/AbortableIterationConsumer$IterationStatus;}
     */
-   public <U extends T> AbortableIterationConsumer.IterationStatus m_dksrxtyd(TypeFilter<T, U> arg, Box arg2, AbortableIterationConsumer<? super U> arg3) {
-      Collection<? extends T> collection = this.collection.getAllOfType(arg.getBaseClass());
+   public <U extends T> AbortableIterationConsumer.IterationStatus forEachIntersection(
+      TypeFilter<T, U> filter, Box box, AbortableIterationConsumer<? super U> consumer
+   ) {
+      Collection<? extends T> collection = this.collection.getAllOfType(filter.getBaseClass());
       if (collection.isEmpty()) {
          return AbortableIterationConsumer.IterationStatus.CONTINUE;
       } else {
          for (T lv : collection) {
-            U lv2 = arg.downcast(lv);
-            if (lv2 != null && lv.getBoundingBox().intersects(arg2) && arg3.accept(lv2).shouldAbort()) {
+            U lv2 = filter.downcast(lv);
+            if (lv2 != null && lv.getBoundingBox().intersects(box) && consumer.accept(lv2).shouldAbort()) {
                return AbortableIterationConsumer.IterationStatus.ABORT;
             }
          }
diff -bur namedTargetSrc/net/minecraft/world/entity/EntityTrackingStatus.java namedSrc/net/minecraft/world/entity/EntityTrackingStatus.java
--- namedTargetSrc/net/minecraft/world/entity/EntityTrackingStatus.java	2023-07-05 00:15:56.769582284 +0000
+++ namedSrc/net/minecraft/world/entity/EntityTrackingStatus.java	2023-07-05 00:14:07.507709711 +0000
@@ -67,11 +67,11 @@
     * @mapping {@literal hashed m_rfofxpgp Lnet/minecraft/unmapped/C_blgonjzp;m_rfofxpgp(Lnet/minecraft/unmapped/C_whqcauvq;)Lnet/minecraft/unmapped/C_blgonjzp;}
     * @mapping {@literal named fromLevelType Lnet/minecraft/world/entity/EntityTrackingStatus;fromLevelType(Lnet/minecraft/world/chunk/ChunkLoadStatus;)Lnet/minecraft/world/entity/EntityTrackingStatus;}
     */
-   public static EntityTrackingStatus fromLevelType(ChunkLoadStatus arg) {
-      if (arg.matchesOrAfter(ChunkLoadStatus.ENTITY_TICKING)) {
+   public static EntityTrackingStatus fromLevelType(ChunkLoadStatus status) {
+      if (status.matchesOrAfter(ChunkLoadStatus.ENTITY_TICKING)) {
          return TICKING;
       } else {
-         return arg.matchesOrAfter(ChunkLoadStatus.FULL) ? TRACKED : HIDDEN;
+         return status.matchesOrAfter(ChunkLoadStatus.FULL) ? TRACKED : HIDDEN;
       }
    }
 }
diff -bur namedTargetSrc/net/minecraft/world/entity/SectionedEntityCache.java namedSrc/net/minecraft/world/entity/SectionedEntityCache.java
--- namedTargetSrc/net/minecraft/world/entity/SectionedEntityCache.java	2023-07-05 00:15:56.793582680 +0000
+++ namedSrc/net/minecraft/world/entity/SectionedEntityCache.java	2023-07-05 00:14:07.535710216 +0000
@@ -62,16 +62,17 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_nrjurdxh Lnet/minecraft/unmapped/C_pctdblhz;m_nrjurdxh(Lnet/minecraft/unmapped/C_hbcjzgoe;Lnet/minecraft/unmapped/C_gibrwunu;)V}
+    * @mapping {@literal named forEachInBox Lnet/minecraft/world/entity/SectionedEntityCache;forEachInBox(Lnet/minecraft/util/math/Box;Lnet/minecraft/util/function/AbortableIterationConsumer;)V}
     */
-   public void m_nrjurdxh(Box arg, AbortableIterationConsumer<EntityTrackingSection<T>> arg2) {
+   public void forEachInBox(Box box, AbortableIterationConsumer<EntityTrackingSection<T>> section) {
       int i = 2;
-      int j = ChunkSectionPos.getSectionCoord(arg.minX - 2.0);
-      int k = ChunkSectionPos.getSectionCoord(arg.minY - 4.0);
-      int l = ChunkSectionPos.getSectionCoord(arg.minZ - 2.0);
-      int m = ChunkSectionPos.getSectionCoord(arg.maxX + 2.0);
-      int n = ChunkSectionPos.getSectionCoord(arg.maxY + 0.0);
-      int o = ChunkSectionPos.getSectionCoord(arg.maxZ + 2.0);
+      int j = ChunkSectionPos.getSectionCoord(box.minX - 2.0);
+      int k = ChunkSectionPos.getSectionCoord(box.minY - 4.0);
+      int l = ChunkSectionPos.getSectionCoord(box.minZ - 2.0);
+      int m = ChunkSectionPos.getSectionCoord(box.maxX + 2.0);
+      int n = ChunkSectionPos.getSectionCoord(box.maxY + 0.0);
+      int o = ChunkSectionPos.getSectionCoord(box.maxZ + 2.0);
 
       for (int p = j; p <= m; ++p) {
          long q = ChunkSectionPos.asLong(p, 0, 0);
@@ -84,7 +85,7 @@
             int u = ChunkSectionPos.unpackZ(s);
             if (t >= k && t <= n && u >= l && u <= o) {
                EntityTrackingSection<T> lv = this.trackingSections.get(s);
-               if (lv != null && !lv.isEmpty() && lv.getStatus().shouldTrack() && arg2.accept(lv).shouldAbort()) {
+               if (lv != null && !lv.isEmpty() && lv.getStatus().shouldTrack() && section.accept(lv).shouldAbort()) {
                   return;
                }
             }
@@ -173,17 +174,19 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_dwrsback Lnet/minecraft/unmapped/C_pctdblhz;m_dwrsback(Lnet/minecraft/unmapped/C_hbcjzgoe;Lnet/minecraft/unmapped/C_gibrwunu;)V}
+    * @mapping {@literal named forEachIntersection Lnet/minecraft/world/entity/SectionedEntityCache;forEachIntersection(Lnet/minecraft/util/math/Box;Lnet/minecraft/util/function/AbortableIterationConsumer;)V}
     */
-   public void m_dwrsback(Box arg, AbortableIterationConsumer<T> arg2) {
-      this.m_nrjurdxh(arg, arg3 -> arg3.m_xasgejxo(arg, arg2));
+   public void forEachIntersection(Box box, AbortableIterationConsumer<T> consumer) {
+      this.forEachInBox(box, section -> section.forEachIntersection(box, consumer));
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_rascyktu Lnet/minecraft/unmapped/C_pctdblhz;m_rascyktu(Lnet/minecraft/unmapped/C_ocpldaah;Lnet/minecraft/unmapped/C_hbcjzgoe;Lnet/minecraft/unmapped/C_gibrwunu;)V}
+    * @mapping {@literal named forEachIntersection Lnet/minecraft/world/entity/SectionedEntityCache;forEachIntersection(Lnet/minecraft/util/TypeFilter;Lnet/minecraft/util/math/Box;Lnet/minecraft/util/function/AbortableIterationConsumer;)V}
     */
-   public <U extends T> void m_rascyktu(TypeFilter<T, U> arg, Box arg2, AbortableIterationConsumer<U> arg3) {
-      this.m_nrjurdxh(arg2, arg4 -> arg4.m_dksrxtyd(arg, arg2, arg3));
+   public <U extends T> void forEachIntersection(TypeFilter<T, U> filter, Box box, AbortableIterationConsumer<U> consumer) {
+      this.forEachInBox(box, section -> section.forEachIntersection(filter, box, consumer));
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/world/entity/SimpleEntityLookup.java namedSrc/net/minecraft/world/entity/SimpleEntityLookup.java
--- namedTargetSrc/net/minecraft/world/entity/SimpleEntityLookup.java	2023-07-05 00:15:56.881584133 +0000
+++ namedSrc/net/minecraft/world/entity/SimpleEntityLookup.java	2023-07-05 00:14:07.671712666 +0000
@@ -79,7 +79,7 @@
     */
    @Override
    public void forEachIntersecting(Box box, Consumer<T> action) {
-      this.cache.m_dwrsback(box, AbortableIterationConsumer.forConsumer(action));
+      this.cache.forEachIntersection(box, AbortableIterationConsumer.forConsumer(action));
    }
 
    /**
@@ -87,6 +87,6 @@
     */
    @Override
    public <U extends T> void forEachIntersecting(TypeFilter<T, U> filter, Box box, AbortableIterationConsumer<U> consumer) {
-      this.cache.m_rascyktu(filter, box, consumer);
+      this.cache.forEachIntersection(filter, box, consumer);
    }
 }
diff -bur namedTargetSrc/net/minecraft/world/gen/chunk/BlendingData.java namedSrc/net/minecraft/world/gen/chunk/BlendingData.java
--- namedTargetSrc/net/minecraft/world/gen/chunk/BlendingData.java	2023-07-05 00:15:56.853583671 +0000
+++ namedSrc/net/minecraft/world/gen/chunk/BlendingData.java	2023-07-05 00:14:07.639712090 +0000
@@ -198,7 +198,7 @@
    public static BlendingData getBlendingData(ChunkRegion region, int x, int z) {
       Chunk lv = region.getChunk(x, z);
       BlendingData lv2 = lv.getBlendingData();
-      if (lv2 != null && lv.m_edeniyps().isAtLeast(ChunkStatus.BIOMES)) {
+      if (lv2 != null && lv.getHighestChunkStatus().isAtLeast(ChunkStatus.BIOMES)) {
          lv2.calculateData(lv, getAdjacentChunksWithNoise(region, x, z, false));
          return lv2;
       } else {
diff -bur namedTargetSrc/net/minecraft/world/poi/PointOfInterestStorage.java namedSrc/net/minecraft/world/poi/PointOfInterestStorage.java
--- namedTargetSrc/net/minecraft/world/poi/PointOfInterestStorage.java	2023-07-05 00:15:56.777582416 +0000
+++ namedSrc/net/minecraft/world/poi/PointOfInterestStorage.java	2023-07-05 00:14:07.515709856 +0000
@@ -347,15 +347,15 @@
     * @mapping {@literal hashed m_nnrgqcxo Lnet/minecraft/unmapped/C_uegwgivt;m_nnrgqcxo(Lnet/minecraft/unmapped/C_zubvmeye;Lnet/minecraft/unmapped/C_aurosfgf;)V}
     * @mapping {@literal named initForPalette Lnet/minecraft/world/poi/PointOfInterestStorage;initForPalette(Lnet/minecraft/util/math/ChunkSectionPos;Lnet/minecraft/world/chunk/ChunkSection;)V}
     */
-   public void initForPalette(ChunkSectionPos arg, ChunkSection section) {
-      Util.ifPresentOrElse(this.get(arg.asLong()), arg3 -> arg3.updatePointsOfInterest(biConsumer -> {
+   public void initForPalette(ChunkSectionPos pos, ChunkSection section) {
+      Util.ifPresentOrElse(this.get(pos.asLong()), set -> set.updatePointsOfInterest(consumer -> {
             if (shouldScan(section)) {
-               this.scanAndPopulate(section, arg, biConsumer);
+               this.scanAndPopulate(section, pos, consumer);
             }
          }), () -> {
          if (shouldScan(section)) {
-            PointOfInterestSet lv = this.getOrCreate(arg.asLong());
-            this.scanAndPopulate(section, arg, lv::add);
+            PointOfInterestSet lv = this.getOrCreate(pos.asLong());
+            this.scanAndPopulate(section, pos, lv::add);
          }
       });
    }
@@ -379,7 +379,7 @@
                BlockState lv = section.getBlockState(
                   ChunkSectionPos.getLocalCoord(pos.getX()), ChunkSectionPos.getLocalCoord(pos.getY()), ChunkSectionPos.getLocalCoord(pos.getZ())
                );
-               PointOfInterestTypes.getType(lv).ifPresent(arg2 -> populator.accept(pos, arg2));
+               PointOfInterestTypes.getType(lv).ifPresent(type -> populator.accept(pos, type));
             }
          );
    }
diff -bur namedTargetSrc/net/minecraft/world/storage/EntityChunkDataAccess.java namedSrc/net/minecraft/world/storage/EntityChunkDataAccess.java
--- namedTargetSrc/net/minecraft/world/storage/EntityChunkDataAccess.java	2023-07-05 00:15:56.781582482 +0000
+++ namedSrc/net/minecraft/world/storage/EntityChunkDataAccess.java	2023-07-05 00:14:07.523710000 +0000
@@ -74,11 +74,11 @@
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_xyuwhjxc;<init>(Lnet/minecraft/unmapped/C_bdwnwhiu;Ljava/nio/file/Path;Lcom/mojang/datafixers/DataFixer;ZLjava/util/concurrent/Executor;)V}
     * @mapping {@literal named <init> Lnet/minecraft/world/storage/EntityChunkDataAccess;<init>(Lnet/minecraft/server/world/ServerWorld;Ljava/nio/file/Path;Lcom/mojang/datafixers/DataFixer;ZLjava/util/concurrent/Executor;)V}
     */
-   public EntityChunkDataAccess(ServerWorld world, Path path, DataFixer dataFixer, boolean bl, Executor executor) {
+   public EntityChunkDataAccess(ServerWorld world, Path storageDirectory, DataFixer dataFixer, boolean dsync, Executor executor) {
       this.world = world;
       this.dataFixer = dataFixer;
       this.taskExecutor = TaskExecutor.create(executor, "entity-deserializer");
-      this.dataLoadWorker = new StorageIoWorker(path, bl, "entities");
+      this.dataLoadWorker = new StorageIoWorker(storageDirectory, dsync, "entities");
    }
 
    /**
@@ -88,13 +88,13 @@
    public CompletableFuture<ChunkDataList<Entity>> readChunkData(ChunkPos pos) {
       return this.emptyChunks.contains(pos.toLong())
          ? CompletableFuture.completedFuture(emptyDataList(pos))
-         : this.dataLoadWorker.readChunkData(pos).thenApplyAsync(optional -> {
-            if (optional.isEmpty()) {
+         : this.dataLoadWorker.readChunkData(pos).thenApplyAsync(chunkData -> {
+            if (chunkData.isEmpty()) {
                this.emptyChunks.add(pos.toLong());
                return emptyDataList(pos);
             } else {
                try {
-                  ChunkPos lv = getChunkPos((NbtCompound)optional.get());
+                  ChunkPos lv = getChunkPos((NbtCompound)chunkData.get());
                   if (!Objects.equals(pos, lv)) {
                      LOGGER.error("Chunk file at {} is in the wrong location. (Expected {}, got {})", pos, pos, lv);
                   }
@@ -102,7 +102,7 @@
                   LOGGER.warn("Failed to parse chunk {} position info", pos, var6);
                }
    
-               NbtCompound lv2 = this.fixChunkData((NbtCompound)optional.get());
+               NbtCompound lv2 = this.fixChunkData((NbtCompound)chunkData.get());
                NbtList lv3 = lv2.getList("Entities", NbtElement.COMPOUND_TYPE);
                List<Entity> list = (List)EntityType.streamFromNbt(lv3, this.world).collect(ImmutableList.toImmutableList());
                return new ChunkDataList(pos, list);
diff -bur namedTargetSrc/net/minecraft/world/storage/RegionBasedStorage.java namedSrc/net/minecraft/world/storage/RegionBasedStorage.java
--- namedTargetSrc/net/minecraft/world/storage/RegionBasedStorage.java	2023-07-05 00:15:56.781582482 +0000
+++ namedSrc/net/minecraft/world/storage/RegionBasedStorage.java	2023-07-05 00:14:07.519709928 +0000
@@ -155,7 +155,7 @@
    protected void write(ChunkPos pos, @Nullable NbtCompound nbt) throws IOException {
       RegionFile lv = this.getRegionFile(pos);
       if (nbt == null) {
-         lv.m_xintzxzy(pos);
+         lv.clear(pos);
       } else {
          DataOutputStream dataOutputStream = lv.getChunkOutputStream(pos);
 
diff -bur namedTargetSrc/net/minecraft/world/storage/RegionFile.java namedSrc/net/minecraft/world/storage/RegionFile.java
--- namedTargetSrc/net/minecraft/world/storage/RegionFile.java	2023-07-05 00:15:56.857583737 +0000
+++ namedSrc/net/minecraft/world/storage/RegionFile.java	2023-07-05 00:14:07.643712162 +0000
@@ -32,43 +32,51 @@
     */
    private static final Logger LOGGER = LogUtils.getLogger();
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_ecfxbygp Lnet/minecraft/unmapped/C_kykyawqb;f_ecfxbygp:I}
+    * @mapping {@literal named SECTOR_BYTE_LIMIT Lnet/minecraft/world/storage/RegionFile;SECTOR_BYTE_LIMIT:I}
     */
-   private static final int f_ecfxbygp = 4096;
+   private static final int SECTOR_BYTE_LIMIT = 4096;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_srhyfbtq Lnet/minecraft/unmapped/C_kykyawqb;f_srhyfbtq:I}
+    * @mapping {@literal named SECTOR_INT_LIMIT Lnet/minecraft/world/storage/RegionFile;SECTOR_INT_LIMIT:I}
     */
    @VisibleForTesting
-   protected static final int f_srhyfbtq = 1024;
+   protected static final int SECTOR_INT_LIMIT = 1024;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_torejiiv Lnet/minecraft/unmapped/C_kykyawqb;f_torejiiv:I}
+    * @mapping {@literal named CHUNK_HEADER_SIZE Lnet/minecraft/world/storage/RegionFile;CHUNK_HEADER_SIZE:I}
     */
-   private static final int f_torejiiv = 5;
+   private static final int CHUNK_HEADER_SIZE = 5;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_pebydogu Lnet/minecraft/unmapped/C_kykyawqb;f_pebydogu:I}
+    * @mapping {@literal named HEADER_OFFSET Lnet/minecraft/world/storage/RegionFile;HEADER_OFFSET:I}
     */
-   private static final int f_pebydogu = 0;
+   private static final int HEADER_OFFSET = 0;
    /**
     * @mapping {@literal hashed f_mmilontz Lnet/minecraft/unmapped/C_kykyawqb;f_mmilontz:Ljava/nio/ByteBuffer;}
-    * @mapping {@literal named ZERO Lnet/minecraft/world/storage/RegionFile;ZERO:Ljava/nio/ByteBuffer;}
+    * @mapping {@literal named PADDING_BUFFER Lnet/minecraft/world/storage/RegionFile;PADDING_BUFFER:Ljava/nio/ByteBuffer;}
     */
-   private static final ByteBuffer ZERO = ByteBuffer.allocateDirect(1);
+   private static final ByteBuffer PADDING_BUFFER = ByteBuffer.allocateDirect(1);
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_knlsaycj Lnet/minecraft/unmapped/C_kykyawqb;f_knlsaycj:Ljava/lang/String;}
+    * @mapping {@literal named EXTERNAL_FILE_EXTENSION Lnet/minecraft/world/storage/RegionFile;EXTERNAL_FILE_EXTENSION:Ljava/lang/String;}
     */
-   private static final String f_knlsaycj = ".mcc";
+   private static final String EXTERNAL_FILE_EXTENSION = ".mcc";
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_uzbltvoa Lnet/minecraft/unmapped/C_kykyawqb;f_uzbltvoa:I}
+    * @mapping {@literal named EXTERNAL_STREAM_FLAG Lnet/minecraft/world/storage/RegionFile;EXTERNAL_STREAM_FLAG:I}
     */
-   private static final int f_uzbltvoa = 128;
+   private static final int EXTERNAL_STREAM_FLAG = 128;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_egrpyabe Lnet/minecraft/unmapped/C_kykyawqb;f_egrpyabe:I}
+    * @mapping {@literal named EXTERNAL_CHUNK_THRESHOLD Lnet/minecraft/world/storage/RegionFile;EXTERNAL_CHUNK_THRESHOLD:I}
     */
-   private static final int f_egrpyabe = 256;
+   private static final int EXTERNAL_CHUNK_THRESHOLD = 256;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_dxhmyvjp Lnet/minecraft/unmapped/C_kykyawqb;f_dxhmyvjp:I}
+    * @mapping {@literal named CHUNK_NOT_PRESENT Lnet/minecraft/world/storage/RegionFile;CHUNK_NOT_PRESENT:I}
     */
-   private static final int f_dxhmyvjp = 0;
+   private static final int CHUNK_NOT_PRESENT = 0;
    /**
     * @mapping {@literal hashed f_ramzmnqn Lnet/minecraft/unmapped/C_kykyawqb;f_ramzmnqn:Ljava/nio/channels/FileChannel;}
     * @mapping {@literal named channel Lnet/minecraft/world/storage/RegionFile;channel:Ljava/nio/channels/FileChannel;}
@@ -208,7 +216,7 @@
                      LOGGER.warn("Chunk has both internal and external streams");
                   }
 
-                  return this.m_naxlpaqf(pos, getChunkStreamVersionId(b));
+                  return this.createExternalChunkInputStream(pos, getChunkStreamVersionId(b));
                } else if (n > byteBuffer.remaining()) {
                   LOGGER.error("Chunk {} stream is truncated: expected {} but read {}", pos, n, byteBuffer.remaining());
                   return null;
@@ -216,7 +224,7 @@
                   LOGGER.error("Declared size {} of chunk {} is negative", m, pos);
                   return null;
                } else {
-                  return this.m_lyzbhxyo(pos, b, getInputStream(byteBuffer, n));
+                  return this.createChunkInputStream(pos, b, getInputStream(byteBuffer, n));
                }
             }
          }
@@ -224,9 +232,10 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_pliiokxw Lnet/minecraft/unmapped/C_kykyawqb;m_pliiokxw()I}
+    * @mapping {@literal named getTimestamp Lnet/minecraft/world/storage/RegionFile;getTimestamp()I}
     */
-   private static int m_pliiokxw() {
+   private static int getTimestamp() {
       return (int)(Util.getEpochTimeMs() / 1000L);
    }
 
@@ -234,43 +243,45 @@
     * @mapping {@literal hashed m_oodaxowl Lnet/minecraft/unmapped/C_kykyawqb;m_oodaxowl(B)Z}
     * @mapping {@literal named hasChunkStreamVersionId Lnet/minecraft/world/storage/RegionFile;hasChunkStreamVersionId(B)Z}
     */
-   private static boolean hasChunkStreamVersionId(byte b) {
-      return (b & 128) != 0;
+   private static boolean hasChunkStreamVersionId(byte flags) {
+      return (flags & 128) != 0;
    }
 
    /**
     * @mapping {@literal hashed m_nmxbyxnr Lnet/minecraft/unmapped/C_kykyawqb;m_nmxbyxnr(B)B}
     * @mapping {@literal named getChunkStreamVersionId Lnet/minecraft/world/storage/RegionFile;getChunkStreamVersionId(B)B}
     */
-   private static byte getChunkStreamVersionId(byte b) {
-      return (byte)(b & -129);
+   private static byte getChunkStreamVersionId(byte flags) {
+      return (byte)(flags & -129);
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_lyzbhxyo Lnet/minecraft/unmapped/C_kykyawqb;m_lyzbhxyo(Lnet/minecraft/unmapped/C_ynrszrtu;BLjava/io/InputStream;)Ljava/io/DataInputStream;}
+    * @mapping {@literal named createChunkInputStream Lnet/minecraft/world/storage/RegionFile;createChunkInputStream(Lnet/minecraft/util/math/ChunkPos;BLjava/io/InputStream;)Ljava/io/DataInputStream;}
     */
    @Nullable
-   private DataInputStream m_lyzbhxyo(ChunkPos arg, byte b, InputStream inputStream) throws IOException {
-      ChunkStreamVersion lv = ChunkStreamVersion.get(b);
+   private DataInputStream createChunkInputStream(ChunkPos pos, byte versionId, InputStream input) throws IOException {
+      ChunkStreamVersion lv = ChunkStreamVersion.get(versionId);
       if (lv == null) {
-         LOGGER.error("Chunk {} has invalid chunk stream version {}", arg, b);
+         LOGGER.error("Chunk {} has invalid chunk stream version {}", pos, versionId);
          return null;
       } else {
-         return new DataInputStream(lv.wrap(inputStream));
+         return new DataInputStream(lv.wrap(input));
       }
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_naxlpaqf Lnet/minecraft/unmapped/C_kykyawqb;m_naxlpaqf(Lnet/minecraft/unmapped/C_ynrszrtu;B)Ljava/io/DataInputStream;}
+    * @mapping {@literal named createExternalChunkInputStream Lnet/minecraft/world/storage/RegionFile;createExternalChunkInputStream(Lnet/minecraft/util/math/ChunkPos;B)Ljava/io/DataInputStream;}
     */
    @Nullable
-   private DataInputStream m_naxlpaqf(ChunkPos arg, byte b) throws IOException {
-      Path path = this.getExternalChunkPath(arg);
+   private DataInputStream createExternalChunkInputStream(ChunkPos pos, byte versionId) throws IOException {
+      Path path = this.getExternalChunkPath(pos);
       if (!Files.isRegularFile(path, new LinkOption[0])) {
          LOGGER.error("External chunk path {} is not file", path);
          return null;
       } else {
-         return this.m_lyzbhxyo(arg, b, Files.newInputStream(path));
+         return this.createChunkInputStream(pos, versionId, Files.newInputStream(path));
       }
    }
 
@@ -383,16 +394,17 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_xintzxzy Lnet/minecraft/unmapped/C_kykyawqb;m_xintzxzy(Lnet/minecraft/unmapped/C_ynrszrtu;)V}
+    * @mapping {@literal named clear Lnet/minecraft/world/storage/RegionFile;clear(Lnet/minecraft/util/math/ChunkPos;)V}
     */
-   public void m_xintzxzy(ChunkPos arg) throws IOException {
-      int i = getIndex(arg);
+   public void clear(ChunkPos pos) throws IOException {
+      int i = getIndex(pos);
       int j = this.sectorData.get(i);
       if (j != 0) {
          this.sectorData.put(i, 0);
-         this.saveTimes.put(i, m_pliiokxw());
+         this.saveTimes.put(i, getTimestamp());
          this.writeHeader();
-         Files.deleteIfExists(this.getExternalChunkPath(arg));
+         Files.deleteIfExists(this.getExternalChunkPath(pos));
          this.sectors.free(getOffset(j), getSize(j));
       }
    }
@@ -401,12 +413,12 @@
     * @mapping {@literal hashed m_obaxgaxq Lnet/minecraft/unmapped/C_kykyawqb;m_obaxgaxq(Lnet/minecraft/unmapped/C_ynrszrtu;Ljava/nio/ByteBuffer;)V}
     * @mapping {@literal named writeChunk Lnet/minecraft/world/storage/RegionFile;writeChunk(Lnet/minecraft/util/math/ChunkPos;Ljava/nio/ByteBuffer;)V}
     */
-   protected synchronized void writeChunk(ChunkPos pos, ByteBuffer byteBuffer) throws IOException {
+   protected synchronized void writeChunk(ChunkPos pos, ByteBuffer buf) throws IOException {
       int i = getIndex(pos);
       int j = this.sectorData.get(i);
       int k = getOffset(j);
       int l = getSize(j);
-      int m = byteBuffer.remaining();
+      int m = buf.remaining();
       int n = getSectorCount(m);
       int o;
       RegionFile.OutputAction lv;
@@ -415,17 +427,17 @@
          LOGGER.warn("Saving oversized chunk {} ({} bytes} to external file {}", pos, m, path);
          n = 1;
          o = this.sectors.allocate(n);
-         lv = this.writeSafely(path, byteBuffer);
-         ByteBuffer byteBuffer2 = this.m_fnnafhpi();
+         lv = this.writeSafely(path, buf);
+         ByteBuffer byteBuffer2 = this.createHeaderBuf();
          this.channel.write(byteBuffer2, (long)(o * 4096));
       } else {
          o = this.sectors.allocate(n);
          lv = () -> Files.deleteIfExists(this.getExternalChunkPath(pos));
-         this.channel.write(byteBuffer, (long)(o * 4096));
+         this.channel.write(buf, (long)(o * 4096));
       }
 
       this.sectorData.put(i, this.packSectorData(o, n));
-      this.saveTimes.put(i, m_pliiokxw());
+      this.saveTimes.put(i, getTimestamp());
       this.writeHeader();
       lv.run();
       if (k != 0) {
@@ -434,9 +446,10 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_fnnafhpi Lnet/minecraft/unmapped/C_kykyawqb;m_fnnafhpi()Ljava/nio/ByteBuffer;}
+    * @mapping {@literal named createHeaderBuf Lnet/minecraft/world/storage/RegionFile;createHeaderBuf()Ljava/nio/ByteBuffer;}
     */
-   private ByteBuffer m_fnnafhpi() {
+   private ByteBuffer createHeaderBuf() {
       ByteBuffer byteBuffer = ByteBuffer.allocate(5);
       byteBuffer.putInt(1);
       byteBuffer.put((byte)(this.outputChunkStreamVersion.getId() | 128));
@@ -448,13 +461,13 @@
     * @mapping {@literal hashed m_bsyvgedc Lnet/minecraft/unmapped/C_kykyawqb;m_bsyvgedc(Ljava/nio/file/Path;Ljava/nio/ByteBuffer;)Lnet/minecraft/unmapped/C_kykyawqb$C_mbnkvpjn;}
     * @mapping {@literal named writeSafely Lnet/minecraft/world/storage/RegionFile;writeSafely(Ljava/nio/file/Path;Ljava/nio/ByteBuffer;)Lnet/minecraft/world/storage/RegionFile$OutputAction;}
     */
-   private RegionFile.OutputAction writeSafely(Path path, ByteBuffer byteBuffer) throws IOException {
+   private RegionFile.OutputAction writeSafely(Path path, ByteBuffer buf) throws IOException {
       Path path2 = Files.createTempFile(this.directory, "tmp", null);
       FileChannel fileChannel = FileChannel.open(path2, StandardOpenOption.CREATE, StandardOpenOption.WRITE);
 
       try {
-         byteBuffer.position(5);
-         fileChannel.write(byteBuffer);
+         buf.position(5);
+         fileChannel.write(buf);
       } catch (Throwable var8) {
          if (fileChannel != null) {
             try {
@@ -531,7 +544,7 @@
       int i = (int)this.channel.size();
       int j = getSectorCount(i) * 4096;
       if (i != j) {
-         ByteBuffer byteBuffer = ZERO.duplicate();
+         ByteBuffer byteBuffer = PADDING_BUFFER.duplicate();
          byteBuffer.position(0);
          this.channel.write(byteBuffer, (long)(j - 1));
       }
diff -bur namedTargetSrc/net/minecraft/world/storage/SectorMap.java namedSrc/net/minecraft/world/storage/SectorMap.java
--- namedTargetSrc/net/minecraft/world/storage/SectorMap.java	2023-07-05 00:15:56.893584332 +0000
+++ namedSrc/net/minecraft/world/storage/SectorMap.java	2023-07-05 00:14:07.687712955 +0000
@@ -53,10 +53,11 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_dfszizcy Lnet/minecraft/unmapped/C_vsnirdkc;m_dfszizcy()Lit/unimi/dsi/fastutil/ints/IntSet;}
+    * @mapping {@literal named toSet Lnet/minecraft/world/storage/SectorMap;toSet()Lit/unimi/dsi/fastutil/ints/IntSet;}
     */
    @VisibleForTesting
-   public IntSet m_dfszizcy() {
+   public IntSet toSet() {
       return (IntSet)this.bitSet.stream().collect(IntArraySet::new, IntCollection::add, IntCollection::addAll);
    }
 }
diff -bur namedTargetSrc/net/minecraft/world/storage/StorageIoWorker.java namedSrc/net/minecraft/world/storage/StorageIoWorker.java
--- namedTargetSrc/net/minecraft/world/storage/StorageIoWorker.java	2023-07-05 00:15:56.901584464 +0000
+++ namedSrc/net/minecraft/world/storage/StorageIoWorker.java	2023-07-05 00:14:07.691713027 +0000
@@ -61,13 +61,15 @@
     */
    private final Map<ChunkPos, StorageIoWorker.Result> results = Maps.<ChunkPos, StorageIoWorker.Result>newLinkedHashMap();
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_eqfuhsox Lnet/minecraft/unmapped/C_ffgsaknh;f_eqfuhsox:Lit/unimi/dsi/fastutil/longs/Long2ObjectLinkedOpenHashMap;}
+    * @mapping {@literal named blendingStatusCaches Lnet/minecraft/world/storage/StorageIoWorker;blendingStatusCaches:Lit/unimi/dsi/fastutil/longs/Long2ObjectLinkedOpenHashMap;}
     */
-   private final Long2ObjectLinkedOpenHashMap<CompletableFuture<BitSet>> f_eqfuhsox = new Long2ObjectLinkedOpenHashMap<>();
+   private final Long2ObjectLinkedOpenHashMap<CompletableFuture<BitSet>> blendingStatusCaches = new Long2ObjectLinkedOpenHashMap<>();
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_cmzfptka Lnet/minecraft/unmapped/C_ffgsaknh;f_cmzfptka:I}
+    * @mapping {@literal named MAX_REGION_CACHE_SIZE Lnet/minecraft/world/storage/StorageIoWorker;MAX_REGION_CACHE_SIZE:I}
     */
-   private static final int f_cmzfptka = 1024;
+   private static final int MAX_REGION_CACHE_SIZE = 1024;
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_ffgsaknh;<init>(Ljava/nio/file/Path;ZLjava/lang/String;)V}
@@ -90,7 +92,7 @@
 
       for (int j = lv.getRegionX(); j <= lv2.getRegionX(); ++j) {
          for (int k = lv.getRegionZ(); k <= lv2.getRegionZ(); ++k) {
-            BitSet bitSet = (BitSet)this.m_nwcchuzp(j, k).join();
+            BitSet bitSet = (BitSet)this.getBlendingStatus(j, k).join();
             if (!bitSet.isEmpty()) {
                ChunkPos lv3 = ChunkPos.minOfRegion(j, k);
                int l = Math.max(lv.x - lv3.x, 0);
@@ -115,17 +117,17 @@
 
    /**
     * @mapping {@literal hashed m_nwcchuzp Lnet/minecraft/unmapped/C_ffgsaknh;m_nwcchuzp(II)Ljava/util/concurrent/CompletableFuture;}
-    * @mapping {@literal named m_nwcchuzp Lnet/minecraft/world/storage/StorageIoWorker;m_nwcchuzp(II)Ljava/util/concurrent/CompletableFuture;}
+    * @mapping {@literal named getBlendingStatus Lnet/minecraft/world/storage/StorageIoWorker;getBlendingStatus(II)Ljava/util/concurrent/CompletableFuture;}
     */
-   private CompletableFuture<BitSet> m_nwcchuzp(int regionX, int regionZ) {
+   private CompletableFuture<BitSet> getBlendingStatus(int regionX, int regionZ) {
       long l = ChunkPos.toLong(regionX, regionZ);
-      synchronized (this.f_eqfuhsox) {
-         CompletableFuture<BitSet> completableFuture = this.f_eqfuhsox.getAndMoveToFirst(l);
+      synchronized (this.blendingStatusCaches) {
+         CompletableFuture<BitSet> completableFuture = this.blendingStatusCaches.getAndMoveToFirst(l);
          if (completableFuture == null) {
-            completableFuture = this.m_zyiverhw(regionX, regionZ);
-            this.f_eqfuhsox.putAndMoveToFirst(l, completableFuture);
-            if (this.f_eqfuhsox.size() > 1024) {
-               this.f_eqfuhsox.removeLast();
+            completableFuture = this.computeRegionBlendingStatus(regionX, regionZ);
+            this.blendingStatusCaches.putAndMoveToFirst(l, completableFuture);
+            if (this.blendingStatusCaches.size() > 1024) {
+               this.blendingStatusCaches.removeLast();
             }
          }
 
@@ -135,9 +137,9 @@
 
    /**
     * @mapping {@literal hashed m_zyiverhw Lnet/minecraft/unmapped/C_ffgsaknh;m_zyiverhw(II)Ljava/util/concurrent/CompletableFuture;}
-    * @mapping {@literal named m_zyiverhw Lnet/minecraft/world/storage/StorageIoWorker;m_zyiverhw(II)Ljava/util/concurrent/CompletableFuture;}
+    * @mapping {@literal named computeRegionBlendingStatus Lnet/minecraft/world/storage/StorageIoWorker;computeRegionBlendingStatus(II)Ljava/util/concurrent/CompletableFuture;}
     */
-   private CompletableFuture<BitSet> m_zyiverhw(int x, int z) {
+   private CompletableFuture<BitSet> computeRegionBlendingStatus(int x, int z) {
       return CompletableFuture.supplyAsync(
          () -> {
             ChunkPos lv = ChunkPos.minOfRegion(x, z);
@@ -145,21 +147,21 @@
             BitSet bitSet = new BitSet();
             ChunkPos.stream(lv, lv2)
                .forEach(
-                  arg -> {
+                  pos -> {
                      SelectiveNbtCollector lvx = new SelectiveNbtCollector(
                         new FieldSelector(NbtInt.TYPE, "DataVersion"), new FieldSelector(NbtCompound.TYPE, "blending_data")
                      );
          
                      try {
-                        this.scanChunk(arg, lvx).join();
+                        this.scanChunk(pos, lvx).join();
                      } catch (Exception var7) {
-                        LOGGER.warn("Failed to scan chunk {}", arg, var7);
+                        LOGGER.warn("Failed to scan chunk {}", pos, var7);
                         return;
                      }
          
                      NbtElement lv2x = lvx.getRoot();
-                     if (lv2x instanceof NbtCompound lv3 && this.m_yhgjzcrh(lv3)) {
-                        int ix = arg.getRegionRelativeZ() * 32 + arg.getRegionRelativeX();
+                     if (lv2x instanceof NbtCompound lv3 && this.needsBlending(lv3)) {
+                        int ix = pos.getRegionRelativeZ() * 32 + pos.getRegionRelativeX();
                         bitSet.set(ix);
                      }
                   }
@@ -172,9 +174,9 @@
 
    /**
     * @mapping {@literal hashed m_yhgjzcrh Lnet/minecraft/unmapped/C_ffgsaknh;m_yhgjzcrh(Lnet/minecraft/unmapped/C_hhlwcnih;)Z}
-    * @mapping {@literal named m_yhgjzcrh Lnet/minecraft/world/storage/StorageIoWorker;m_yhgjzcrh(Lnet/minecraft/nbt/NbtCompound;)Z}
+    * @mapping {@literal named needsBlending Lnet/minecraft/world/storage/StorageIoWorker;needsBlending(Lnet/minecraft/nbt/NbtCompound;)Z}
     */
-   private boolean m_yhgjzcrh(NbtCompound nbt) {
+   private boolean needsBlending(NbtCompound nbt) {
       return nbt.contains("DataVersion", NbtElement.NUMBER_TYPE) && nbt.getInt("DataVersion") >= 3441
          ? nbt.contains("blending_data", NbtElement.COMPOUND_TYPE)
          : true;
@@ -186,7 +188,7 @@
     */
    public CompletableFuture<Void> setResult(ChunkPos pos, @Nullable NbtCompound nbt) {
       return this.run(() -> {
-         StorageIoWorker.Result lv = (StorageIoWorker.Result)this.results.computeIfAbsent(pos, arg2x -> new StorageIoWorker.Result(nbt));
+         StorageIoWorker.Result lv = (StorageIoWorker.Result)this.results.computeIfAbsent(pos, key -> new StorageIoWorker.Result(nbt));
          lv.nbt = nbt;
          return Either.left(lv.future);
       }).thenCompose(Function.identity());
@@ -220,11 +222,13 @@
    public CompletableFuture<Void> completeAll(boolean sync) {
       CompletableFuture<Void> completableFuture = this.run(
             () -> Either.left(
-                  CompletableFuture.allOf((CompletableFuture[])this.results.values().stream().map(arg -> arg.future).toArray(i -> new CompletableFuture[i]))
+                  CompletableFuture.allOf(
+                     (CompletableFuture[])this.results.values().stream().map(result -> result.future).toArray(i -> new CompletableFuture[i])
+                  )
                )
          )
          .thenCompose(Function.identity());
-      return sync ? completableFuture.thenCompose(arg -> this.run(() -> {
+      return sync ? completableFuture.thenCompose(v -> this.run(() -> {
             try {
                this.storage.sync();
                return Either.left(null);
@@ -232,7 +236,7 @@
                LOGGER.warn("Failed to synchronize chunks", (Throwable)var2x);
                return Either.right(var2x);
             }
-         })) : completableFuture.thenCompose(arg -> this.run(() -> Either.left(null)));
+         })) : completableFuture.thenCompose(v -> this.run(() -> Either.left(null)));
    }
 
    /**
@@ -264,9 +268,9 @@
     * @mapping {@literal named run Lnet/minecraft/world/storage/StorageIoWorker;run(Ljava/util/function/Supplier;)Ljava/util/concurrent/CompletableFuture;}
     */
    private <T> CompletableFuture<T> run(Supplier<Either<T, Exception>> task) {
-      return this.executor.askFallible(arg -> new TaskQueue.PrioritizedTask(StorageIoWorker.Priority.FOREGROUND.ordinal(), () -> {
+      return this.executor.askFallible(listener -> new TaskQueue.PrioritizedTask(StorageIoWorker.Priority.FOREGROUND.ordinal(), () -> {
             if (!this.closed.get()) {
-               arg.send((Either)task.get());
+               listener.send((Either)task.get());
             }
 
             this.writeRemainingResults();
@@ -315,7 +319,7 @@
     */
    public void close() throws IOException {
       if (this.closed.compareAndSet(false, true)) {
-         this.executor.ask(arg -> new TaskQueue.PrioritizedTask(StorageIoWorker.Priority.SHUTDOWN.ordinal(), () -> arg.send(Unit.INSTANCE))).join();
+         this.executor.ask(listener -> new TaskQueue.PrioritizedTask(StorageIoWorker.Priority.SHUTDOWN.ordinal(), () -> listener.send(Unit.INSTANCE))).join();
          this.executor.close();
 
          try {
diff -bur namedTargetSrc/net/minecraft/world/storage/VersionedChunkStorage.java namedSrc/net/minecraft/world/storage/VersionedChunkStorage.java
--- namedTargetSrc/net/minecraft/world/storage/VersionedChunkStorage.java	2023-07-05 00:15:56.921584794 +0000
+++ namedSrc/net/minecraft/world/storage/VersionedChunkStorage.java	2023-07-05 00:14:07.715713459 +0000
@@ -26,9 +26,10 @@
  */
 public class VersionedChunkStorage implements AutoCloseable {
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_zympnlkc Lnet/minecraft/unmapped/C_hzmyuskp;f_zympnlkc:I}
+    * @mapping {@literal named FEATURE_UPDATE_VERSION Lnet/minecraft/world/storage/VersionedChunkStorage;FEATURE_UPDATE_VERSION:I}
     */
-   public static final int f_zympnlkc = 1493;
+   public static final int FEATURE_UPDATE_VERSION = 1493;
    /**
     * @mapping {@literal hashed f_rmprhtbt Lnet/minecraft/unmapped/C_hzmyuskp;f_rmprhtbt:Lnet/minecraft/unmapped/C_ffgsaknh;}
     * @mapping {@literal named worker Lnet/minecraft/world/storage/VersionedChunkStorage;worker:Lnet/minecraft/world/storage/StorageIoWorker;}
@@ -65,44 +66,44 @@
 
    /**
     * @mapping {@literal hashed m_rbmihoak Lnet/minecraft/unmapped/C_hzmyuskp;m_rbmihoak(Lnet/minecraft/unmapped/C_xhhleach;Ljava/util/function/Supplier;Lnet/minecraft/unmapped/C_hhlwcnih;Ljava/util/Optional;)Lnet/minecraft/unmapped/C_hhlwcnih;}
-    * @mapping {@literal named m_rbmihoak Lnet/minecraft/world/storage/VersionedChunkStorage;m_rbmihoak(Lnet/minecraft/registry/RegistryKey;Ljava/util/function/Supplier;Lnet/minecraft/nbt/NbtCompound;Ljava/util/Optional;)Lnet/minecraft/nbt/NbtCompound;}
+    * @mapping {@literal named updateChunkNbt Lnet/minecraft/world/storage/VersionedChunkStorage;updateChunkNbt(Lnet/minecraft/registry/RegistryKey;Ljava/util/function/Supplier;Lnet/minecraft/nbt/NbtCompound;Ljava/util/Optional;)Lnet/minecraft/nbt/NbtCompound;}
     */
-   public NbtCompound m_rbmihoak(
-      RegistryKey<World> registryKey,
-      Supplier<PersistentStateManager> supplier,
-      NbtCompound arg2,
-      Optional<RegistryKey<Codec<? extends ChunkGenerator>>> optional
+   public NbtCompound updateChunkNbt(
+      RegistryKey<World> worldKey,
+      Supplier<PersistentStateManager> stateManagerSupplier,
+      NbtCompound nbt,
+      Optional<RegistryKey<Codec<? extends ChunkGenerator>>> generator
    ) {
-      int i = getDataVersion(arg2);
+      int i = getDataVersion(nbt);
       if (i < 1493) {
-         arg2 = DataFixTypes.CHUNK.updateDataFixer(this.dataFixer, arg2, i, 1493);
-         if (arg2.getCompound("Level").getBoolean("hasLegacyStructureData")) {
-            FeatureUpdater lv = this.m_roftcfgx(registryKey, supplier);
-            arg2 = lv.getUpdatedReferences(arg2);
+         nbt = DataFixTypes.CHUNK.updateDataFixer(this.dataFixer, nbt, i, 1493);
+         if (nbt.getCompound("Level").getBoolean("hasLegacyStructureData")) {
+            FeatureUpdater lv = this.getFeatureUpdater(worldKey, stateManagerSupplier);
+            nbt = lv.getUpdatedReferences(nbt);
          }
       }
 
-      injectDatafixingContext(arg2, registryKey, optional);
-      arg2 = DataFixTypes.CHUNK.updateDataFixer(this.dataFixer, arg2, Math.max(1493, i));
+      injectDatafixingContext(nbt, worldKey, generator);
+      nbt = DataFixTypes.CHUNK.updateDataFixer(this.dataFixer, nbt, Math.max(1493, i));
       if (i < SharedConstants.getGameVersion().getWorldVersionData().getDataVersion()) {
-         NbtHelper.putCurrentDataVersion(arg2);
+         NbtHelper.putCurrentDataVersion(nbt);
       }
 
-      arg2.remove("__context");
-      return arg2;
+      nbt.remove("__context");
+      return nbt;
    }
 
    /**
     * @mapping {@literal hashed m_roftcfgx Lnet/minecraft/unmapped/C_hzmyuskp;m_roftcfgx(Lnet/minecraft/unmapped/C_xhhleach;Ljava/util/function/Supplier;)Lnet/minecraft/unmapped/C_qpbbnpoq;}
-    * @mapping {@literal named m_roftcfgx Lnet/minecraft/world/storage/VersionedChunkStorage;m_roftcfgx(Lnet/minecraft/registry/RegistryKey;Ljava/util/function/Supplier;)Lnet/minecraft/world/FeatureUpdater;}
+    * @mapping {@literal named getFeatureUpdater Lnet/minecraft/world/storage/VersionedChunkStorage;getFeatureUpdater(Lnet/minecraft/registry/RegistryKey;Ljava/util/function/Supplier;)Lnet/minecraft/world/FeatureUpdater;}
     */
-   private FeatureUpdater m_roftcfgx(RegistryKey<World> registryKey, Supplier<PersistentStateManager> supplier) {
+   private FeatureUpdater getFeatureUpdater(RegistryKey<World> worldKey, Supplier<PersistentStateManager> stateManagerSupplier) {
       FeatureUpdater lv = this.featureUpdater;
       if (lv == null) {
          synchronized (this) {
             lv = this.featureUpdater;
             if (lv == null) {
-               this.featureUpdater = lv = FeatureUpdater.create(registryKey, (PersistentStateManager)supplier.get());
+               this.featureUpdater = lv = FeatureUpdater.create(worldKey, (PersistentStateManager)stateManagerSupplier.get());
             }
          }
       }
@@ -117,7 +118,7 @@
    public static void injectDatafixingContext(NbtCompound nbt, RegistryKey<World> dimension, Optional<RegistryKey<Codec<? extends ChunkGenerator>>> generator) {
       NbtCompound lv = new NbtCompound();
       lv.putString("dimension", dimension.getValue().toString());
-      generator.ifPresent(registryKey -> lv.putString("generator", registryKey.getValue().toString()));
+      generator.ifPresent(generatorHolder -> lv.putString("generator", generatorHolder.getValue().toString()));
       nbt.put("__context", lv);
    }

github-actions · 2023-07-05T00:16:01Z

View the diff here (3/3):

diff -bur namedTargetSrc/net/minecraft/world/storage/WorldSaveStorage.java namedSrc/net/minecraft/world/storage/WorldSaveStorage.java
--- namedTargetSrc/net/minecraft/world/storage/WorldSaveStorage.java	2023-07-05 00:15:56.949585256 +0000
+++ namedSrc/net/minecraft/world/storage/WorldSaveStorage.java	2023-07-05 00:14:07.743713964 +0000
@@ -55,15 +55,15 @@
 import net.minecraft.registry.RegistryKey;
 import net.minecraft.server.world.FeatureAndDataSettings;
 import net.minecraft.text.Text;
-import net.minecraft.unmapped.C_dpwvcnei;
-import net.minecraft.unmapped.C_jgxjjhjn;
 import net.minecraft.util.FileNameUtil;
 import net.minecraft.util.Identifier;
-import net.minecraft.util.InvalidSymlinkException;
-import net.minecraft.util.Symlink;
 import net.minecraft.util.Util;
 import net.minecraft.util.WorldSavePath;
 import net.minecraft.util.crash.CrashMemoryReserve;
+import net.minecraft.util.path.AllowedSymlinkPathMatcher;
+import net.minecraft.util.path.InvalidSymlinkException;
+import net.minecraft.util.path.Symlink;
+import net.minecraft.util.path.SymlinkValidator;
 import net.minecraft.world.SaveProperties;
 import net.minecraft.world.World;
 import net.minecraft.world.WorldInfo;
@@ -116,13 +116,15 @@
     */
    private static final String DATA_KEY = "Data";
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_tpniflmb Lnet/minecraft/unmapped/C_bpwagnit;f_tpniflmb:Lnet/minecraft/unmapped/C_dpwvcnei;}
+    * @mapping {@literal named PATH_MATCHER Lnet/minecraft/world/storage/WorldSaveStorage;PATH_MATCHER:Lnet/minecraft/util/path/AllowedSymlinkPathMatcher;}
     */
-   private static final C_dpwvcnei f_tpniflmb = new C_dpwvcnei(List.of());
+   private static final AllowedSymlinkPathMatcher PATH_MATCHER = new AllowedSymlinkPathMatcher(List.of());
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_rcocbkwh Lnet/minecraft/unmapped/C_bpwagnit;f_rcocbkwh:Ljava/lang/String;}
+    * @mapping {@literal named ALLOWED_SYMLINKS_FILE_NAME Lnet/minecraft/world/storage/WorldSaveStorage;ALLOWED_SYMLINKS_FILE_NAME:Ljava/lang/String;}
     */
-   public static final String f_rcocbkwh = "allowed_symlinks.txt";
+   public static final String ALLOWED_SYMLINKS_FILE_NAME = "allowed_symlinks.txt";
    /**
     * @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;}
@@ -139,15 +141,16 @@
     */
    final DataFixer dataFixer;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_rhxyetit Lnet/minecraft/unmapped/C_bpwagnit;f_rhxyetit:Lnet/minecraft/unmapped/C_jgxjjhjn;}
+    * @mapping {@literal named symlinkValidator Lnet/minecraft/world/storage/WorldSaveStorage;symlinkValidator:Lnet/minecraft/util/path/SymlinkValidator;}
     */
-   private final C_jgxjjhjn f_rhxyetit;
+   private final SymlinkValidator symlinkValidator;
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_bpwagnit;<init>(Ljava/nio/file/Path;Ljava/nio/file/Path;Lnet/minecraft/unmapped/C_jgxjjhjn;Lcom/mojang/datafixers/DataFixer;)V}
-    * @mapping {@literal named <init> Lnet/minecraft/world/storage/WorldSaveStorage;<init>(Ljava/nio/file/Path;Ljava/nio/file/Path;Lnet/minecraft/unmapped/C_jgxjjhjn;Lcom/mojang/datafixers/DataFixer;)V}
+    * @mapping {@literal named <init> Lnet/minecraft/world/storage/WorldSaveStorage;<init>(Ljava/nio/file/Path;Ljava/nio/file/Path;Lnet/minecraft/util/path/SymlinkValidator;Lcom/mojang/datafixers/DataFixer;)V}
     */
-   public WorldSaveStorage(Path savesDirectory, Path backupsDirectory, C_jgxjjhjn arg, DataFixer dataFixer) {
+   public WorldSaveStorage(Path savesDirectory, Path backupsDirectory, SymlinkValidator symlinkValidator, DataFixer dataFixer) {
       this.dataFixer = dataFixer;
 
       try {
@@ -158,20 +161,21 @@
 
       this.savesDirectory = savesDirectory;
       this.backupsDirectory = backupsDirectory;
-      this.f_rhxyetit = arg;
+      this.symlinkValidator = symlinkValidator;
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_yekueuyb Lnet/minecraft/unmapped/C_bpwagnit;m_yekueuyb(Ljava/nio/file/Path;)Lnet/minecraft/unmapped/C_jgxjjhjn;}
+    * @mapping {@literal named getSymlinkValidator Lnet/minecraft/world/storage/WorldSaveStorage;getSymlinkValidator(Ljava/nio/file/Path;)Lnet/minecraft/util/path/SymlinkValidator;}
     */
-   public static C_jgxjjhjn m_yekueuyb(Path path) {
-      if (Files.exists(path, new LinkOption[0])) {
+   public static SymlinkValidator getSymlinkValidator(Path file) {
+      if (Files.exists(file, new LinkOption[0])) {
          try {
-            BufferedReader bufferedReader = Files.newBufferedReader(path);
+            BufferedReader bufferedReader = Files.newBufferedReader(file);
 
-            C_jgxjjhjn var2;
+            SymlinkValidator var2;
             try {
-               var2 = new C_jgxjjhjn(C_dpwvcnei.m_bzqsaxjp(bufferedReader));
+               var2 = new SymlinkValidator(AllowedSymlinkPathMatcher.fromReader(bufferedReader));
             } catch (Throwable var5) {
                if (bufferedReader != null) {
                   try {
@@ -194,7 +198,7 @@
          }
       }
 
-      return new C_jgxjjhjn(f_tpniflmb);
+      return new SymlinkValidator(PATH_MATCHER);
    }
 
    /**
@@ -202,7 +206,7 @@
     * @mapping {@literal named create Lnet/minecraft/world/storage/WorldSaveStorage;create(Ljava/nio/file/Path;)Lnet/minecraft/world/storage/WorldSaveStorage;}
     */
    public static WorldSaveStorage create(Path path) {
-      C_jgxjjhjn lv = m_yekueuyb(path.resolve("allowed_symlinks.txt"));
+      SymlinkValidator lv = getSymlinkValidator(path.resolve("allowed_symlinks.txt"));
       return new WorldSaveStorage(path, path.resolve("../backups"), lv, Schemas.getFixer());
    }
 
@@ -256,7 +260,8 @@
                List<WorldSaveStorage.WorldDirectory> list = stream.filter(path -> Files.isDirectory(path, new LinkOption[0]))
                   .map(WorldSaveStorage.WorldDirectory::new)
                   .filter(
-                     arg -> Files.isRegularFile(arg.getWorldDatPath(), new LinkOption[0]) || Files.isRegularFile(arg.getOldWorldDatPath(), new LinkOption[0])
+                     directory -> Files.isRegularFile(directory.getWorldDatPath(), new LinkOption[0])
+                           || Files.isRegularFile(directory.getOldWorldDatPath(), new LinkOption[0])
                   )
                   .toList();
                var3 = new WorldSaveStorage.WorldList(list);
@@ -325,7 +330,7 @@
          );
       }
 
-      return Util.m_odlcpqdv(list).thenApply(listx -> listx.stream().filter(Objects::nonNull).sorted().toList());
+      return Util.m_odlcpqdv(list).thenApply(saves -> saves.stream().filter(Objects::nonNull).sorted().toList());
    }
 
    /**
@@ -384,7 +389,7 @@
     * @mapping {@literal named createWorldDataParser Lnet/minecraft/world/storage/WorldSaveStorage;createWorldDataParser(Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/server/world/FeatureAndDataSettings;Lnet/minecraft/registry/Registry;Lcom/mojang/serialization/Lifecycle;)Ljava/util/function/BiFunction;}
     */
    static BiFunction<Path, DataFixer, Pair<SaveProperties, WorldDimensions.Baked>> createWorldDataParser(
-      DynamicOps<NbtElement> ops, FeatureAndDataSettings arg, Registry<DimensionOptions> registry, Lifecycle lifecycle
+      DynamicOps<NbtElement> ops, FeatureAndDataSettings settings, Registry<DimensionOptions> dimensionRegistry, Lifecycle lifecycle
    ) {
       return (path, dataFixer) -> {
          NbtCompound lv;
@@ -401,8 +406,8 @@
          Dynamic<?> dynamic = DataFixTypes.LEVEL.updateDataFixer(dataFixer, new Dynamic<>(ops, lv3), i);
          GeneratorOptions lv5 = readGeneratorProperties(dynamic, dataFixer, i).getOrThrow(false, Util.addPrefix("WorldGenSettings: ", LOGGER::error));
          SaveVersionInfo lv6 = SaveVersionInfo.fromDynamic(dynamic);
-         WorldInfo lv7 = WorldInfo.fromDynamic(dynamic, arg);
-         WorldDimensions.Baked lv8 = lv5.getDimensions().bake(registry);
+         WorldInfo lv7 = WorldInfo.fromDynamic(dynamic, settings);
+         WorldDimensions.Baked lv8 = lv5.getDimensions().bake(dimensionRegistry);
          Lifecycle lifecycle2 = lv8.getLifecycle().add(lifecycle);
          WorldSaveProperties lv9 = WorldSaveProperties.readProperties(
             dynamic, dataFixer, i, lv4, lv7, lv6, lv8.specialWorldProperty(), lv5.options(), lifecycle2
@@ -420,7 +425,7 @@
          try {
             if (Files.isSymbolicLink(path)) {
                List<Symlink> list = new ArrayList();
-               this.f_rhxyetit.m_gnwqyyfp(path, list);
+               this.symlinkValidator.validate(path, list);
                if (!list.isEmpty()) {
                   LOGGER.warn(InvalidSymlinkException.createErrorMessage(path, list));
                   return new WorldSaveSummary.SymlinkSaveSummary(directory.getName(), directory.getIconPath());
@@ -464,7 +469,7 @@
          .asStream()
          .flatMap(dynamicx -> dynamicx.asString().result().map(Identifier::tryParse).stream())
          .collect(Collectors.toSet());
-      return FeatureFlags.MAIN_REGISTRY.checkedBitSetOf(set, arg -> {
+      return FeatureFlags.MAIN_REGISTRY.checkedBitSetOf(set, id -> {
       });
    }
 
@@ -485,7 +490,7 @@
     */
    public boolean isWorldNameValid(String name) {
       try {
-         Path path = this.m_xnikwmwt(name);
+         Path path = this.getSavePath(name);
          Files.createDirectory(path);
          Files.deleteIfExists(path);
          return true;
@@ -499,14 +504,15 @@
     * @mapping {@literal named worldSaveExists Lnet/minecraft/world/storage/WorldSaveStorage;worldSaveExists(Ljava/lang/String;)Z}
     */
    public boolean worldSaveExists(String name) {
-      return Files.isDirectory(this.m_xnikwmwt(name), new LinkOption[0]);
+      return Files.isDirectory(this.getSavePath(name), new LinkOption[0]);
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_xnikwmwt Lnet/minecraft/unmapped/C_bpwagnit;m_xnikwmwt(Ljava/lang/String;)Ljava/nio/file/Path;}
+    * @mapping {@literal named getSavePath Lnet/minecraft/world/storage/WorldSaveStorage;getSavePath(Ljava/lang/String;)Ljava/nio/file/Path;}
     */
-   private Path m_xnikwmwt(String string) {
-      return this.savesDirectory.resolve(string);
+   private Path getSavePath(String name) {
+      return this.savesDirectory.resolve(name);
    }
 
    /**
@@ -526,32 +532,36 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_vtcefrig Lnet/minecraft/unmapped/C_bpwagnit;m_vtcefrig(Ljava/lang/String;)Lnet/minecraft/unmapped/C_bpwagnit$C_unecclfw;}
+    * @mapping {@literal named createSession Lnet/minecraft/world/storage/WorldSaveStorage;createSession(Ljava/lang/String;)Lnet/minecraft/world/storage/WorldSaveStorage$Session;}
     */
-   public WorldSaveStorage.Session m_vtcefrig(String string) throws IOException, InvalidSymlinkException {
-      Path path = this.m_xnikwmwt(string);
-      List<Symlink> list = this.f_rhxyetit.m_xbvtudgh(path, true);
+   public WorldSaveStorage.Session createSession(String name) throws IOException, InvalidSymlinkException {
+      Path path = this.getSavePath(name);
+      List<Symlink> list = this.symlinkValidator.validateSave(path, true);
       if (!list.isEmpty()) {
          throw new InvalidSymlinkException(path, list);
       } else {
-         return new WorldSaveStorage.Session(string, path);
+         return new WorldSaveStorage.Session(name, path);
       }
    }
 
    /**
+    * Creates a session without verifying symlinks.
+    * 
     * @mapping {@literal hashed m_mglixzcz Lnet/minecraft/unmapped/C_bpwagnit;m_mglixzcz(Ljava/lang/String;)Lnet/minecraft/unmapped/C_bpwagnit$C_unecclfw;}
-    * @mapping {@literal named createSession Lnet/minecraft/world/storage/WorldSaveStorage;createSession(Ljava/lang/String;)Lnet/minecraft/world/storage/WorldSaveStorage$Session;}
+    * @mapping {@literal named createUncheckedSession Lnet/minecraft/world/storage/WorldSaveStorage;createUncheckedSession(Ljava/lang/String;)Lnet/minecraft/world/storage/WorldSaveStorage$Session;}
     */
-   public WorldSaveStorage.Session createSession(String directoryName) throws IOException {
-      Path path = this.m_xnikwmwt(directoryName);
-      return new WorldSaveStorage.Session(directoryName, path);
+   public WorldSaveStorage.Session createUncheckedSession(String name) throws IOException {
+      Path path = this.getSavePath(name);
+      return new WorldSaveStorage.Session(name, path);
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_hzomuijm Lnet/minecraft/unmapped/C_bpwagnit;m_hzomuijm()Lnet/minecraft/unmapped/C_jgxjjhjn;}
+    * @mapping {@literal named getSymlinkValidator Lnet/minecraft/world/storage/WorldSaveStorage;getSymlinkValidator()Lnet/minecraft/util/path/SymlinkValidator;}
     */
-   public C_jgxjjhjn m_hzomuijm() {
-      return this.f_rhxyetit;
+   public SymlinkValidator getSymlinkValidator() {
+      return this.symlinkValidator;
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/world/tick/WorldTickScheduler.java namedSrc/net/minecraft/world/tick/WorldTickScheduler.java
--- namedTargetSrc/net/minecraft/world/tick/WorldTickScheduler.java	2023-07-05 00:15:56.853583671 +0000
+++ namedSrc/net/minecraft/world/tick/WorldTickScheduler.java	2023-07-05 00:14:07.639712090 +0000
@@ -376,24 +376,25 @@
     * @mapping {@literal named scheduleTicks Lnet/minecraft/world/tick/WorldTickScheduler;scheduleTicks(Lnet/minecraft/util/math/BlockBox;Lnet/minecraft/util/math/Vec3i;)V}
     */
    public void scheduleTicks(BlockBox area, Vec3i offset) {
-      this.m_tjhcqdwk(this, area, offset);
+      this.scheduleTicks(this, area, offset);
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_tjhcqdwk Lnet/minecraft/unmapped/C_cropbciq;m_tjhcqdwk(Lnet/minecraft/unmapped/C_cropbciq;Lnet/minecraft/unmapped/C_hmqypqzz;Lnet/minecraft/unmapped/C_ceivtqhh;)V}
+    * @mapping {@literal named scheduleTicks Lnet/minecraft/world/tick/WorldTickScheduler;scheduleTicks(Lnet/minecraft/world/tick/WorldTickScheduler;Lnet/minecraft/util/math/BlockBox;Lnet/minecraft/util/math/Vec3i;)V}
     */
-   public void m_tjhcqdwk(WorldTickScheduler<T> arg, BlockBox arg2, Vec3i arg3) {
+   public void scheduleTicks(WorldTickScheduler<T> scheduler, BlockBox area, Vec3i offset) {
       List<OrderedTick<T>> list = new ArrayList();
-      Predicate<OrderedTick<T>> predicate = arg2x -> arg2.isInside(arg2x.pos());
-      arg.alreadyTickedTicks.stream().filter(predicate).forEach(list::add);
-      arg.tickableTicks.stream().filter(predicate).forEach(list::add);
-      arg.visitChunks(arg2, (lx, argx) -> argx.getQueueAsStream().filter(predicate).forEach(list::add));
+      Predicate<OrderedTick<T>> predicate = tick -> area.isInside(tick.pos());
+      scheduler.alreadyTickedTicks.stream().filter(predicate).forEach(list::add);
+      scheduler.tickableTicks.stream().filter(predicate).forEach(list::add);
+      scheduler.visitChunks(area, (pos, schedulerx) -> schedulerx.getQueueAsStream().filter(predicate).forEach(list::add));
       LongSummaryStatistics longSummaryStatistics = list.stream().mapToLong(OrderedTick::subTickOrder).summaryStatistics();
       long l = longSummaryStatistics.getMin();
       long m = longSummaryStatistics.getMax();
       list.forEach(
-         arg2x -> this.scheduleTick(
-               new OrderedTick<>((T)arg2x.type(), arg2x.pos().add(arg3), arg2x.triggerTick(), arg2x.priority(), arg2x.subTickOrder() - l + m + 1L)
+         tick -> this.scheduleTick(
+               new OrderedTick<>((T)tick.type(), tick.pos().add(offset), tick.triggerTick(), tick.priority(), tick.subTickOrder() - l + m + 1L)
             )
       );
    }
diff -bur namedTargetSrc/net/minecraft/world/updater/WorldUpdater.java namedSrc/net/minecraft/world/updater/WorldUpdater.java
--- namedTargetSrc/net/minecraft/world/updater/WorldUpdater.java	2023-07-05 00:15:56.929584926 +0000
+++ namedSrc/net/minecraft/world/updater/WorldUpdater.java	2023-07-05 00:14:07.723713603 +0000
@@ -219,7 +219,7 @@
                      if (lv6 != null) {
                         int i = VersionedChunkStorage.getDataVersion(lv6);
                         ChunkGenerator lv7 = this.registry.getOrThrow(RegistryKeys.asDimensionKey(lv3)).getChunkGenerator();
-                        NbtCompound lv8 = lv4.m_rbmihoak(lv3, () -> this.persistentStateManager, lv6, lv7.getCodecKey());
+                        NbtCompound lv8 = lv4.updateChunkNbt(lv3, () -> this.persistentStateManager, lv6, lv7.getCodecKey());
                         ChunkPos lv9 = new ChunkPos(lv8.getInt("xPos"), lv8.getInt("zPos"));
                         if (!lv9.equals(lv5)) {
                            LOGGER.warn("Chunk {} has invalid position {}", lv5, lv9);

-Original file line number
+Diff line change
@@ Expand Up / @@ -63,6 +63,7 @@ deobfuscate @@
     enum
     hostname
     interner
+    regex
     linux
     multipoint
     nonnull
@@ Expand Down @@

-Original file line number
+Diff line change
@@ Expand Up @@
     		ARG 5 y
     		ARG 7 z
     		ARG 9 packet
+    	METHOD m_goiqdprm (Lnet/minecraft/unmapped/C_mxrobsgg;)V
+    		ARG 0 player
     	METHOD m_gpbaxfbd updateSleepingPlayers ()V
     	METHOD m_gqdupsiz getEnderDragonFight ()Lnet/minecraft/unmapped/C_hxzjzvro;
     	METHOD m_gqlcytza getAliveEnderDragons ()Ljava/util/List;
@@ Expand Down @@

-Original file line number
+Diff line change
@@ Expand Up @@
     		ARG 2 dependencyKey
     	METHOD m_hwfbhpsk visitDependenciesAndEntry (Lcom/google/common/collect/Multimap;Ljava/util/Set;Ljava/lang/Object;Ljava/util/function/BiConsumer;)V
     		ARG 1 entries
+    		ARG 2 dependencies
     		ARG 3 key
     		ARG 4 entryConsumer
     	METHOD m_iktynrym buildOrdered (Ljava/util/function/BiConsumer;)V
@@ Expand All @@
     		ARG 0 dependencies
     		ARG 1 key
     		ARG 2 dependencyKey
+    	METHOD m_ufmudbxr (Lcom/google/common/collect/Multimap;Ljava/lang/Object;Ljava/lang/Object;)Z
+    		ARG 2 dependency
     	METHOD m_wlepljkw (Lcom/google/common/collect/Multimap;Ljava/util/Set;Ljava/util/function/BiConsumer;Ljava/lang/Object;)V
     		ARG 4 dependency
+    	METHOD m_wnuqluux (Lcom/google/common/collect/Multimap;Ljava/util/Set;Ljava/util/function/BiConsumer;Ljava/lang/Object;)V
+    		ARG 4 entry
     	METHOD m_yiiqjaor (Lcom/google/common/collect/Multimap;Ljava/lang/Object;Ljava/lang/Object;)V
     		ARG 2 dependencyKey
     	CLASS C_zfnezyvd Entry
@@ Expand Down @@

-Original file line number
+Diff line change
@@ -0,0 +1,46 @@
+    CLASS net/minecraft/unmapped/C_dpwvcnei net/minecraft/util/path/AllowedSymlinkPathMatcher
+    	FIELD f_dyomlhne entries Ljava/util/List;
+    	FIELD f_kobjyiln compiledPaths Ljava/util/Map;
+    	FIELD f_yyvxmvav COMMENT_PREFIX Ljava/lang/String;
+    	METHOD <init> (Ljava/util/List;)V
+    		ARG 1 entries
+    	METHOD m_bzqsaxjp fromReader (Ljava/io/BufferedReader;)Lnet/minecraft/unmapped/C_dpwvcnei;
+    		ARG 0 reader
+    	METHOD m_eyexfuet (Ljava/nio/file/FileSystem;Ljava/lang/String;)Ljava/nio/file/PathMatcher;
+    		ARG 2 string
+    	METHOD m_fkjqrxhw (Ljava/lang/String;)Ljava/util/stream/Stream;
+    		ARG 0 line
+    	METHOD m_hxiryxnk (Ljava/nio/file/Path;)Z
+    		ARG 0 path
+    	METHOD m_peeyqein (Ljava/util/List;Ljava/nio/file/Path;)Z
+    		ARG 1 path
+    	METHOD m_qeermkiz get (Ljava/nio/file/FileSystem;)Ljava/nio/file/PathMatcher;
+    		ARG 1 fileSystem
+    	METHOD m_splwlony (Ljava/nio/file/Path;)Z
+    		ARG 0 path
+    	METHOD m_uoddkimh (Ljava/nio/file/FileSystem;Lnet/minecraft/unmapped/C_dpwvcnei$C_xxjtjrav;)Ljava/nio/file/PathMatcher;
+    		ARG 1 entry
+    	METHOD matches (Ljava/nio/file/Path;)Z
+    		ARG 1 path
+    	CLASS C_xjvevvwz EntryType
+    		FIELD f_lqgyclby PREFIX Lnet/minecraft/unmapped/C_dpwvcnei$C_xjvevvwz;
+    		FIELD f_wzqspygh FILE_SYSTEM Lnet/minecraft/unmapped/C_dpwvcnei$C_xjvevvwz;
+    		METHOD compile (Ljava/nio/file/FileSystem;Ljava/lang/String;)Ljava/nio/file/PathMatcher;
+    			ARG 1 fileSystem
+    			ARG 2 pattern
+    		METHOD m_nhlkkubn (Ljava/lang/String;Ljava/nio/file/Path;)Z
+    			ARG 1 path
+    		METHOD m_skmcwfoz (Ljava/nio/file/FileSystem;Ljava/lang/String;)Ljava/nio/file/PathMatcher;
+    			ARG 0 fileSystem
+    			ARG 1 pattern
+    	CLASS C_xxjtjrav Entry
+    		METHOD m_ghiswyim glob (Ljava/lang/String;)Lnet/minecraft/unmapped/C_dpwvcnei$C_xxjtjrav;
+    			ARG 0 pattern
+    		METHOD m_kshughpb prefix (Ljava/lang/String;)Lnet/minecraft/unmapped/C_dpwvcnei$C_xxjtjrav;
+    			ARG 0 pattern
+    		METHOD m_qnxgcaai regex (Ljava/lang/String;)Lnet/minecraft/unmapped/C_dpwvcnei$C_xxjtjrav;
+    			ARG 0 pattern
+    		METHOD m_yodwgzqa parse (Ljava/lang/String;)Ljava/util/Optional;
+    			ARG 0 line
+    		METHOD m_zkiwpebq compile (Ljava/nio/file/FileSystem;)Ljava/nio/file/PathMatcher;
+    			ARG 1 fileSystem

-Original file line number
+Diff line change
@@ -1,4 +1,4 @@
-    CLASS net/minecraft/unmapped/C_qytfiqce net/minecraft/util/InvalidSymlinkException
+    CLASS net/minecraft/unmapped/C_qytfiqce net/minecraft/util/path/InvalidSymlinkException
     	FIELD f_dksvsjpt path Ljava/nio/file/Path;
     	FIELD f_eqcyhpdh links Ljava/util/List;
     	METHOD <init> (Ljava/nio/file/Path;Ljava/util/List;)V
@@ Expand Down @@

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Commit

There are no files selected for viewing

3 comments on commit `3602d4d`

github-actions bot commented on `3602d4d` Jul 5, 2023

github-actions bot commented on `3602d4d` Jul 5, 2023

github-actions bot commented on `3602d4d` Jul 5, 2023

Commit

There are no files selected for viewing

3 comments on commit 3602d4d

github-actions bot commented on 3602d4d Jul 5, 2023

Choose a reason for hiding this comment

github-actions bot commented on 3602d4d Jul 5, 2023

Choose a reason for hiding this comment

github-actions bot commented on 3602d4d Jul 5, 2023

Choose a reason for hiding this comment

3 comments on commit `3602d4d`

github-actions bot commented on `3602d4d` Jul 5, 2023

github-actions bot commented on `3602d4d` Jul 5, 2023

github-actions bot commented on `3602d4d` Jul 5, 2023