fix: bypass BiomeManager to prevent WorldGenRegion.getChunk() deadlock in containers

Author: yynps

.gitignore

@@ -6,6 +6,9 @@ bin
 .classpath
 .project
 
+# vscode
+.vscode
+
 # idea
 out
 *.ipr

build.gradle

@@ -12,7 +12,7 @@ tasks.named('wrapper', Wrapper).configure {
     distributionType = Wrapper.DistributionType.BIN
 }
 
-version = "${minecraft_version}-${mod_version}-uto26"
+version = "${minecraft_version}-${mod_version}-uto27"
 group = mod_group
 
 base {

src/main/java/com/aetherteam/aether/world/BlockLogicUtil.java

@@ -2,10 +2,16 @@
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
+import net.minecraft.core.Holder;
+import net.minecraft.core.QuartPos;
 import net.minecraft.core.SectionPos;
 import net.minecraft.world.level.ChunkPos;
+import net.minecraft.world.level.biome.Biome;
+import net.minecraft.world.level.chunk.ChunkAccess;
 import net.minecraft.world.level.levelgen.structure.BoundingBox;
 
+import java.util.function.Function;
+
 public final class BlockLogicUtil {
     /**
      * Find the entry point for a tunnel piece to a room with an odd-numbered width
@@ -49,6 +55,18 @@ public static BlockPos tunnelFromEvenSquareRoom(BoundingBox box, Direction direc
         );
     }
 
+    /**
+     * Biome getter that reads directly from chunk storage, bypassing BiomeManager → WorldGenRegion.getChunk().
+     * Prevents deadlock: getChunk() hangs in CrashReport/OSHI before throwing, making try-catch useless.
+     */
+    public static Function<BlockPos, Holder<Biome>> createSafeBiomeGetter(ChunkAccess localChunk) {
+        return (pos) -> localChunk.getNoiseBiome(
+                QuartPos.fromBlock(pos.getX()),
+                QuartPos.fromBlock(pos.getY()),
+                QuartPos.fromBlock(pos.getZ())
+        );
+    }
+
     /**
      * Checks if a position for block placement is within a center chunk.
      *

src/main/java/com/aetherteam/aether/world/feature/CrystalIslandFeature.java

@@ -81,7 +81,7 @@ private void setIslandBlock(WorldGenLevel level, BlockPos pos, BlockState testSt
                     NoiseChunk noisechunk = ((ChunkAccessAccessor) chunkAccess).aether$getNoiseChunk();
                     if (noisechunk != null) {
                         CarvingContext carvingcontext = new CarvingContext(noiseBasedChunkGenerator, level.registryAccess(), chunkAccess.getHeightAccessorForGeneration(), noisechunk, serverChunkCache.randomState(), surfaceRule);
-                        Optional<BlockState> state = carvingcontext.topMaterial(level.getBiomeManager()::getNoiseBiomeAtPosition, chunkAccess, pos, false);
+                        Optional<BlockState> state = carvingcontext.topMaterial(BlockLogicUtil.createSafeBiomeGetter(chunkAccess), chunkAccess, pos, false);
                         if (state.isPresent()) {
                             if (testState.is(AetherTags.Blocks.AETHER_DIRT) && !testState.is(AetherBlocks.AETHER_DIRT.get()) && state.get().is(AetherTags.Blocks.AETHER_DIRT)) {
                                 newState = state.get();

src/main/java/com/aetherteam/aether/world/processor/SurfaceRuleProcessor.java

@@ -23,11 +23,7 @@
 import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate;
 import org.jetbrains.annotations.Nullable;
 
-import net.minecraft.core.Holder;
-import net.minecraft.world.level.biome.Biome;
-
 import java.util.Optional;
-import java.util.function.Function;
 
 /**
  * This processor is used to replace grass blocks in the Aether with blocks determined by the biome's surface rules.
@@ -57,29 +53,11 @@ public StructureTemplate.StructureBlockInfo process(LevelReader level, BlockPos
                     NoiseChunk noisechunk = ((ChunkAccessAccessor) chunkAccess).aether$getNoiseChunk();
                     if (noisechunk != null) {
                         CarvingContext carvingcontext = new CarvingContext(noiseBasedChunkGenerator, worldGenLevel.registryAccess(), chunkAccess.getHeightAccessorForGeneration(), noisechunk, serverChunkCache.randomState(), surfaceRule);
-                        // [uto26] Safe biome getter: WorldGenRegion.getChunk() throws IllegalStateException
-                        // when biome sampling reaches chunks outside the generation region. Catch at the
-                        // method reference level to prevent propagation through memoized Supplier chains.
-                        Function<BlockPos, Holder<Biome>> safeBiomeGetter = (pos) -> {
-                            try {
-                                return worldGenLevel.getBiomeManager().getNoiseBiomeAtPosition(pos);
-                            } catch (Exception e) {
-                                return chunkAccess.getNoiseBiome(
-                                    net.minecraft.core.SectionPos.blockToSectionCoord(pos.getX()),
-                                    net.minecraft.core.SectionPos.blockToSectionCoord(pos.getY()),
-                                    net.minecraft.core.SectionPos.blockToSectionCoord(pos.getZ())
-                                );
-                            }
-                        };
-                        try {
-                            Optional<BlockState> state = carvingcontext.topMaterial(safeBiomeGetter, chunkAccess, modifiedBlockInfo.pos(), false);
-                            if (state.isPresent()) {
-                                if (modifiedBlockInfo.state().is(AetherTags.Blocks.AETHER_DIRT) && !modifiedBlockInfo.state().is(AetherBlocks.AETHER_DIRT.get()) && state.get().is(AetherTags.Blocks.AETHER_DIRT)) {
-                                    return new StructureTemplate.StructureBlockInfo(modifiedBlockInfo.pos(), state.get(), null);
-                                }
+                        Optional<BlockState> state = carvingcontext.topMaterial(BlockLogicUtil.createSafeBiomeGetter(chunkAccess), chunkAccess, modifiedBlockInfo.pos(), false);
+                        if (state.isPresent()) {
+                            if (modifiedBlockInfo.state().is(AetherTags.Blocks.AETHER_DIRT) && !modifiedBlockInfo.state().is(AetherBlocks.AETHER_DIRT.get()) && state.get().is(AetherTags.Blocks.AETHER_DIRT)) {
+                                return new StructureTemplate.StructureBlockInfo(modifiedBlockInfo.pos(), state.get(), null);
                             }
-                        } catch (Exception e) {
-                            return modifiedBlockInfo;
                         }
                     }
                 }

src/main/java/com/aetherteam/aether/world/structurepiece/GlowstoneRuinedPortalPiece.java

@@ -311,7 +311,7 @@ public static BlockState getSurfaceBlockForPlacement(LevelAccessor level, BlockP
                             NoiseChunk noisechunk = ((ChunkAccessAccessor) chunkAccess).aether$getNoiseChunk();
                             if (noisechunk != null) {
                                 CarvingContext carvingcontext = new CarvingContext(noiseBasedChunkGenerator, worldGenLevel.registryAccess(), chunkAccess.getHeightAccessorForGeneration(), noisechunk, serverChunkCache.randomState(), surfaceRule);
-                                Optional<BlockState> state = carvingcontext.topMaterial(worldGenLevel.getBiomeManager()::getBiome, chunkAccess, pos, false);
+                                Optional<BlockState> state = carvingcontext.topMaterial(BlockLogicUtil.createSafeBiomeGetter(chunkAccess), chunkAccess, pos, false);
                                 if (state.isPresent()) {
                                     if (originalState.is(AetherTags.Blocks.AETHER_DIRT) && !originalState.is(AetherBlocks.AETHER_DIRT.get()) && state.get().is(AetherTags.Blocks.AETHER_DIRT)) {
                                         return state.get();