From 7278bc1548ae2caae7f16ddd610c1ab7c4078dff Mon Sep 17 00:00:00 2001 From: James Seibel Date: Fri, 18 Aug 2023 16:06:55 -0500 Subject: [PATCH] World gen step reformatting --- .../worldGeneration/step/StepBiomes.java | 16 +++++----------- .../worldGeneration/step/StepFeatures.java | 17 ++++++----------- .../worldGeneration/step/StepNoise.java | 17 ++++++----------- .../step/StepStructureReference.java | 17 ++++++----------- .../step/StepStructureStart.java | 13 +++++-------- .../worldGeneration/step/StepSurface.java | 8 +++----- 6 files changed, 31 insertions(+), 57 deletions(-) diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepBiomes.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepBiomes.java index 16428900a..09147d424 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepBiomes.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepBiomes.java @@ -38,20 +38,14 @@ import net.minecraft.world.level.levelgen.blending.Blender; public final class StepBiomes { - /** - * - */ + public static final ChunkStatus STATUS = ChunkStatus.BIOMES; + private final BatchGenerationEnvironment environment; - /** - * @param batchGenerationEnvironment - */ - public StepBiomes(BatchGenerationEnvironment batchGenerationEnvironment) - { - environment = batchGenerationEnvironment; - } - public final ChunkStatus STATUS = ChunkStatus.BIOMES; + public StepBiomes(BatchGenerationEnvironment batchGenerationEnvironment) { this.environment = batchGenerationEnvironment; } + + public void generateGroup( ThreadedParameters tParams, WorldGenRegion worldGenRegion, diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepFeatures.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepFeatures.java index 45e543f49..a0981e08d 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepFeatures.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepFeatures.java @@ -37,20 +37,15 @@ import net.minecraft.world.level.levelgen.Heightmap; public final class StepFeatures { - /** - * - */ + public static final ChunkStatus STATUS = ChunkStatus.FEATURES; + private final BatchGenerationEnvironment environment; - /** - * @param batchGenerationEnvironment - */ - public StepFeatures(BatchGenerationEnvironment batchGenerationEnvironment) - { - environment = batchGenerationEnvironment; - } - public final ChunkStatus STATUS = ChunkStatus.FEATURES; + + public StepFeatures(BatchGenerationEnvironment batchGenerationEnvironment) { this.environment = batchGenerationEnvironment; } + + public void generateGroup( ThreadedParameters tParams, DhLitWorldGenRegion worldGenRegion, diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepNoise.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepNoise.java index b6209d54f..25e3b2c7f 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepNoise.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepNoise.java @@ -41,20 +41,15 @@ import net.minecraft.world.level.levelgen.blending.Blender; public final class StepNoise { - /** - * - */ + private static final ChunkStatus STATUS = ChunkStatus.NOISE; + private final BatchGenerationEnvironment environment; - /** - * @param batchGenerationEnvironment - */ - public StepNoise(BatchGenerationEnvironment batchGenerationEnvironment) - { - environment = batchGenerationEnvironment; - } - public final ChunkStatus STATUS = ChunkStatus.NOISE; + + public StepNoise(BatchGenerationEnvironment batchGenerationEnvironment) { this.environment = batchGenerationEnvironment; } + + public void generateGroup( ThreadedParameters tParams, WorldGenRegion worldGenRegion, diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepStructureReference.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepStructureReference.java index cfa4622c5..dd2fb24b7 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepStructureReference.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepStructureReference.java @@ -35,20 +35,15 @@ import net.minecraft.world.level.chunk.ProtoChunk; public final class StepStructureReference { - /** - * - */ + private static final ChunkStatus STATUS = ChunkStatus.STRUCTURE_REFERENCES; + private final BatchGenerationEnvironment environment; - /** - * @param batchGenerationEnvironment - */ - public StepStructureReference(BatchGenerationEnvironment batchGenerationEnvironment) - { - environment = batchGenerationEnvironment; - } - public final ChunkStatus STATUS = ChunkStatus.STRUCTURE_REFERENCES; + + public StepStructureReference(BatchGenerationEnvironment batchGenerationEnvironment) { this.environment = batchGenerationEnvironment; } + + public void generateGroup( ThreadedParameters tParams, WorldGenRegion worldGenRegion, diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepStructureStart.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepStructureStart.java index 6dcbcbe33..d6b02b7c5 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepStructureStart.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepStructureStart.java @@ -36,18 +36,15 @@ import org.apache.logging.log4j.Logger; public final class StepStructureStart { private static final Logger LOGGER = DhLoggerBuilder.getLogger(); + private static final ChunkStatus STATUS = ChunkStatus.STRUCTURE_STARTS; private final BatchGenerationEnvironment environment; - /** - * @param batchGenerationEnvironment - */ - public StepStructureStart(BatchGenerationEnvironment batchGenerationEnvironment) - { - environment = batchGenerationEnvironment; - } - public final ChunkStatus STATUS = ChunkStatus.STRUCTURE_STARTS; + + public StepStructureStart(BatchGenerationEnvironment batchGenerationEnvironment) { this.environment = batchGenerationEnvironment; } + + public static class StructStartCorruptedException extends RuntimeException { diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepSurface.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepSurface.java index 6321d955d..c05c03a4b 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepSurface.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepSurface.java @@ -34,16 +34,14 @@ import net.minecraft.world.level.levelgen.Heightmap; public final class StepSurface { + private static final ChunkStatus STATUS = ChunkStatus.SURFACE; + private final BatchGenerationEnvironment environment; - public final ChunkStatus STATUS = ChunkStatus.SURFACE; + public StepSurface(BatchGenerationEnvironment batchGenerationEnvironment) { this.environment = batchGenerationEnvironment; } - public StepSurface(BatchGenerationEnvironment batchGenerationEnvironment) - { - this.environment = batchGenerationEnvironment; - } public void generateGroup(