wisplite/distant-horizons-sharded
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Work on world generator integration to a1.7 rework

Browse Source
This commit is contained in:
TomTheFurry
2022-07-23 16:40:19 +08:00
parent c77d0bab6d
commit 330bab0616
2 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/BatchGenerationEnvironment.java
+16 -10
View File
@@ -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<ArrayGridList<IChunkWrapper>> generateChunks(int minX, int minZ, int genSize, Steps targetStep, double runTimeRatio) {
return null; // TODO: Implement generateChunks
}
}
core
+1 -1
Submodule core updated: 5b1568e9a6...5f486b6258