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

rename Steps -> EGenerationStep

Browse Source
This commit is contained in:
James Seibel
2023-03-10 22:00:26 -06:00
parent dd8ee36487
commit f2be1bd034
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/seibel/lod/core/generation/BatchGenerator.java
+7 -7
View File
@@ -32,7 +32,7 @@ import com.seibel.lod.core.util.LodUtil;
import com.seibel.lod.core.wrapperInterfaces.IWrapperFactory;
import com.seibel.lod.core.wrapperInterfaces.chunk.IChunkWrapper;
import com.seibel.lod.core.wrapperInterfaces.worldGeneration.AbstractBatchGenerationEnvionmentWrapper;
import com.seibel.lod.core.wrapperInterfaces.worldGeneration.AbstractBatchGenerationEnvionmentWrapper.Steps;
import com.seibel.lod.core.wrapperInterfaces.worldGeneration.AbstractBatchGenerationEnvionmentWrapper.EGenerationStep;
import org.apache.logging.log4j.Logger;
import java.util.concurrent.CompletableFuture;
@@ -98,24 +98,24 @@ public class BatchGenerator implements IDhApiWorldGenerator
@Override
public CompletableFuture<Void> generateChunks(int chunkPosMinX, int chunkPosMinZ, byte granularity, byte targetDataDetail, EDhApiDistantGeneratorMode generatorMode, Consumer<Object[]> resultConsumer)
{
Steps targetStep = null;
EGenerationStep targetStep = null;
switch (generatorMode)
{
case PRE_EXISTING_ONLY:
targetStep = Steps.Empty; // NOTE: Only load in existing chunks. No new chunk generation
targetStep = EGenerationStep.Empty; // NOTE: Only load in existing chunks. No new chunk generation
break;
case BIOME_ONLY:
targetStep = Steps.Biomes; // NOTE: No blocks. Require fake height in LodBuilder
targetStep = EGenerationStep.Biomes; // NOTE: No blocks. Require fake height in LodBuilder
break;
case BIOME_ONLY_SIMULATE_HEIGHT:
targetStep = Steps.Noise; // NOTE: Stone only. Require fake surface
targetStep = EGenerationStep.Noise; // NOTE: Stone only. Require fake surface
break;
case SURFACE:
targetStep = Steps.Surface; // Carvers or Surface???
targetStep = EGenerationStep.Surface; // Carvers or Surface???
break;
case FEATURES:
case FULL:
targetStep = Steps.Features;
targetStep = EGenerationStep.Features;
break;
}
core/src/main/java/com/seibel/lod/core/wrapperInterfaces/worldGeneration/AbstractBatchGenerationEnvionmentWrapper.java
+4 -4
View File
@@ -27,12 +27,12 @@ import java.util.function.Consumer;
public abstract class AbstractBatchGenerationEnvionmentWrapper
{
public enum Steps {
public enum EGenerationStep
{
Empty, StructureStart, StructureReference, Biomes, Noise, Surface, Carvers, LiquidCarvers, Features, Light,
}
public AbstractBatchGenerationEnvionmentWrapper(IDhLevel level) {
}
public AbstractBatchGenerationEnvionmentWrapper(IDhLevel level) { }
public abstract void resizeThreadPool(int newThreadCount);
@@ -42,6 +42,6 @@ public abstract class AbstractBatchGenerationEnvionmentWrapper
public abstract void stop(boolean blocking);
public abstract CompletableFuture<Void> generateChunks(int minX, int minZ, int genSize, Steps targetStep, double runTimeRatio, Consumer<IChunkWrapper> resultConsumer);
public abstract CompletableFuture<Void> generateChunks(int minX, int minZ, int genSize, EGenerationStep targetStep, double runTimeRatio, Consumer<IChunkWrapper> resultConsumer);
}