From 330bab061640f05133651334609f9c554a5d5297 Mon Sep 17 00:00:00 2001 From: TomTheFurry Date: Sat, 23 Jul 2022 16:40:19 +0800 Subject: [PATCH] Work on world generator integration to a1.7 rework --- .../BatchGenerationEnvironment.java | 26 ++++++++++++------- core | 2 +- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/BatchGenerationEnvironment.java b/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/BatchGenerationEnvironment.java index 01d2d4ea1..aa3a29d07 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/BatchGenerationEnvironment.java +++ b/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/BatchGenerationEnvironment.java @@ -32,6 +32,7 @@ import com.seibel.lod.core.enums.config.EDistanceGenerationMode; import com.seibel.lod.core.enums.config.ELightGenerationMode; import com.seibel.lod.core.util.gridList.ArrayGridList; import com.seibel.lod.core.util.LodThreadFactory; +import com.seibel.lod.core.wrapperInterfaces.chunk.IChunkWrapper; import com.seibel.lod.core.wrapperInterfaces.world.ILevelWrapper; import com.seibel.lod.core.wrapperInterfaces.worldGeneration.AbstractBatchGenerationEnvionmentWrapper; @@ -502,30 +503,30 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv ChunkSizedData data = LodDataBuilder.createChunkData(wrappedChunk); if (data != null) { - params.lodLevel.submitChunkData(data); + //params.lodLevel.submitChunkData(data); } - params.lodLevel - params.lodBuilder.generateLodNodeFromChunk(params.lodDim, wrappedChunk, - new LodBuilderConfig(EDistanceGenerationMode.FULL), true, e.genAllDetails); + //FIXME: Fix this + //params.lodBuilder.generateLodNodeFromChunk(params.lodDim, wrappedChunk, + // new LodBuilderConfig(EDistanceGenerationMode.FULL), true, e.genAllDetails); } #if POST_MC_1_18_1 else if (isPartial) { LOAD_LOGGER.info("Detected old existing chunk at {}", target.getPos()); - params.lodBuilder.generateLodNodeFromChunk(params.lodDim, wrappedChunk, - new LodBuilderConfig(generationMode), true, e.genAllDetails); + //params.lodBuilder.generateLodNodeFromChunk(params.lodDim, wrappedChunk, + // new LodBuilderConfig(generationMode), true, e.genAllDetails); } #endif else if (target.getStatus() == ChunkStatus.EMPTY && generationMode == EDistanceGenerationMode.NONE) { - params.lodBuilder.generateLodNodeFromChunk(params.lodDim,wrappedChunk, - LodBuilderConfig.getFillVoidConfig(), true, e.genAllDetails); + //params.lodBuilder.generateLodNodeFromChunk(params.lodDim,wrappedChunk, + // LodBuilderConfig.getFillVoidConfig(), true, e.genAllDetails); } else { - params.lodBuilder.generateLodNodeFromChunk(params.lodDim, wrappedChunk, - new LodBuilderConfig(generationMode), true, e.genAllDetails); + //params.lodBuilder.generateLodNodeFromChunk(params.lodDim, wrappedChunk, + // new LodBuilderConfig(generationMode), true, e.genAllDetails); } if (e.lightMode == ELightGenerationMode.FANCY || isFull) { @@ -637,4 +638,9 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv EVENT_LOGGER.error("Batch Chunk Generator shutdown failed! Ignoring child threads...", e); } } + + @Override + public CompletableFuture> generateChunks(int minX, int minZ, int genSize, Steps targetStep, double runTimeRatio) { + return null; // TODO: Implement generateChunks + } } \ No newline at end of file diff --git a/core b/core index 5b1568e9a..5f486b625 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 5b1568e9a69bb698f107a3ee96b11916609d715e +Subproject commit 5f486b625846c76d62d44e910f1018f8bee040e4