From f2be1bd034b966c48f2ce0407e7c99d255ebe300 Mon Sep 17 00:00:00 2001 From: James Seibel Date: Fri, 10 Mar 2023 22:00:26 -0600 Subject: [PATCH] rename Steps -> EGenerationStep --- .../seibel/lod/core/generation/BatchGenerator.java | 14 +++++++------- .../AbstractBatchGenerationEnvionmentWrapper.java | 8 ++++---- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/core/src/main/java/com/seibel/lod/core/generation/BatchGenerator.java b/core/src/main/java/com/seibel/lod/core/generation/BatchGenerator.java index 7f4b861e1..7bf3d5a48 100644 --- a/core/src/main/java/com/seibel/lod/core/generation/BatchGenerator.java +++ b/core/src/main/java/com/seibel/lod/core/generation/BatchGenerator.java @@ -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 generateChunks(int chunkPosMinX, int chunkPosMinZ, byte granularity, byte targetDataDetail, EDhApiDistantGeneratorMode generatorMode, Consumer 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; } diff --git a/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/worldGeneration/AbstractBatchGenerationEnvionmentWrapper.java b/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/worldGeneration/AbstractBatchGenerationEnvionmentWrapper.java index bbd033480..70c1e9538 100644 --- a/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/worldGeneration/AbstractBatchGenerationEnvionmentWrapper.java +++ b/core/src/main/java/com/seibel/lod/core/wrapperInterfaces/worldGeneration/AbstractBatchGenerationEnvionmentWrapper.java @@ -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 generateChunks(int minX, int minZ, int genSize, Steps targetStep, double runTimeRatio, Consumer resultConsumer); + public abstract CompletableFuture generateChunks(int minX, int minZ, int genSize, EGenerationStep targetStep, double runTimeRatio, Consumer resultConsumer); }