diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/BatchGenerationEnvironment.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/BatchGenerationEnvironment.java index 832ec2770..623c78262 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/BatchGenerationEnvironment.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/BatchGenerationEnvironment.java @@ -32,7 +32,6 @@ import com.seibel.distanthorizons.core.config.Config; import com.seibel.distanthorizons.core.logging.ConfigBasedLogger; import com.seibel.distanthorizons.core.logging.ConfigBasedSpamLogger; import com.seibel.distanthorizons.core.pos.DhChunkPos; -import com.seibel.distanthorizons.core.pos.DhSectionPos; import com.seibel.distanthorizons.core.util.objects.EventTimer; import com.seibel.distanthorizons.core.util.LodUtil; import com.seibel.distanthorizons.core.util.gridList.ArrayGridList; @@ -80,7 +79,6 @@ import org.apache.logging.log4j.LogManager; #if MC_VER >= MC_1_19_4 import net.minecraft.core.registries.Registries; #else -import net.minecraft.core.Registry; #endif #if MC_VER <= MC_1_20_4 @@ -575,7 +573,7 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv if (Config.Common.LodBuilding.pullLightingForPregeneratedChunks.get()) { // attempt to get chunk lighting - ChunkLoader.CombinedChunkLightStorage combinedLights = ChunkLoader.readLight(newChunk, chunkData); + ChunkFileReader.CombinedChunkLightStorage combinedLights = ChunkFileReader.readLight(newChunk, chunkData); if (combinedLights != null) { chunkSkyLightingByDhPos.put(dhChunkPos, combinedLights.skyLightStorage); @@ -705,7 +703,7 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv LOAD_LOGGER.debug("DistantHorizons: Loading chunk [" + chunkPos + "] from disk."); @Nullable - ChunkAccess chunk = ChunkLoader.read(level, chunkPos, chunkData); + ChunkAccess chunk = ChunkFileReader.read(level, chunkPos, chunkData); if (chunk != null) { if (Config.Common.LodBuilding.assumePreExistingChunksAreFinished.get()) diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/mimicObject/ChunkLoader.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/mimicObject/ChunkFileReader.java similarity index 99% rename from common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/mimicObject/ChunkLoader.java rename to common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/mimicObject/ChunkFileReader.java index 51058e4b2..2f9107715 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/mimicObject/ChunkLoader.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/mimicObject/ChunkFileReader.java @@ -92,7 +92,7 @@ import net.minecraft.world.level.material.Fluid; import org.jetbrains.annotations.Nullable; -public class ChunkLoader +public class ChunkFileReader { private static final AtomicBoolean ZERO_CHUNK_POS_ERROR_LOGGED_REF = new AtomicBoolean(false);