TerraGenerationStage -> GenerationStage

This commit is contained in:
dfsek
2021-07-22 14:17:12 -07:00
parent 1f9a51fc40
commit 76b6c0a984
9 changed files with 16 additions and 16 deletions
@@ -19,7 +19,7 @@ import com.dfsek.terra.api.world.generator.ChunkData;
import com.dfsek.terra.api.world.generator.Palette; import com.dfsek.terra.api.world.generator.Palette;
import com.dfsek.terra.api.world.generator.Sampler; import com.dfsek.terra.api.world.generator.Sampler;
import com.dfsek.terra.api.world.generator.TerraChunkGenerator; import com.dfsek.terra.api.world.generator.TerraChunkGenerator;
import com.dfsek.terra.api.world.generator.TerraGenerationStage; import com.dfsek.terra.api.world.generator.GenerationStage;
import net.jafama.FastMath; import net.jafama.FastMath;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
@@ -30,7 +30,7 @@ import java.util.Random;
public class NoiseChunkGenerator3D implements TerraChunkGenerator { public class NoiseChunkGenerator3D implements TerraChunkGenerator {
private final ConfigPack configPack; private final ConfigPack configPack;
private final TerraPlugin main; private final TerraPlugin main;
private final List<TerraGenerationStage> generationStages = new ArrayList<>(); private final List<GenerationStage> generationStages = new ArrayList<>();
private final BlockState air; private final BlockState air;
@@ -160,7 +160,7 @@ public class NoiseChunkGenerator3D implements TerraChunkGenerator {
} }
@Override @Override
public List<TerraGenerationStage> getGenerationStages() { public List<GenerationStage> getGenerationStages() {
return generationStages; return generationStages;
} }
@@ -10,14 +10,14 @@ import com.dfsek.terra.api.vector.Vector3;
import com.dfsek.terra.api.world.Chunk; import com.dfsek.terra.api.world.Chunk;
import com.dfsek.terra.api.world.World; import com.dfsek.terra.api.world.World;
import com.dfsek.terra.api.world.generator.Chunkified; import com.dfsek.terra.api.world.generator.Chunkified;
import com.dfsek.terra.api.world.generator.TerraGenerationStage; import com.dfsek.terra.api.world.generator.GenerationStage;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.Random; import java.util.Random;
public class CavePopulator implements TerraGenerationStage, Chunkified { public class CavePopulator implements GenerationStage, Chunkified {
private static final Map<BlockType, BlockState> shiftStorage = new HashMap<>(); // Persist BlockData created for shifts, to avoid re-calculating each time. private static final Map<BlockType, BlockState> shiftStorage = new HashMap<>(); // Persist BlockData created for shifts, to avoid re-calculating each time.
private final TerraPlugin main; private final TerraPlugin main;
@@ -6,12 +6,12 @@ import com.dfsek.terra.api.util.PopulationUtil;
import com.dfsek.terra.api.world.Chunk; import com.dfsek.terra.api.world.Chunk;
import com.dfsek.terra.api.world.World; import com.dfsek.terra.api.world.World;
import com.dfsek.terra.api.world.biome.TerraBiome; import com.dfsek.terra.api.world.biome.TerraBiome;
import com.dfsek.terra.api.world.generator.TerraGenerationStage; import com.dfsek.terra.api.world.generator.GenerationStage;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import java.util.Random; import java.util.Random;
public class OrePopulator implements TerraGenerationStage { public class OrePopulator implements GenerationStage {
private final TerraPlugin main; private final TerraPlugin main;
public OrePopulator(TerraPlugin main) { public OrePopulator(TerraPlugin main) {
@@ -11,13 +11,13 @@ import com.dfsek.terra.api.world.Chunk;
import com.dfsek.terra.api.world.World; import com.dfsek.terra.api.world.World;
import com.dfsek.terra.api.world.biome.generation.BiomeProvider; import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
import com.dfsek.terra.api.world.generator.Chunkified; import com.dfsek.terra.api.world.generator.Chunkified;
import com.dfsek.terra.api.world.generator.TerraGenerationStage; import com.dfsek.terra.api.world.generator.GenerationStage;
import net.jafama.FastMath; import net.jafama.FastMath;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import java.util.Random; import java.util.Random;
public class StructurePopulator implements TerraGenerationStage, Chunkified { public class StructurePopulator implements GenerationStage, Chunkified {
private final TerraPlugin main; private final TerraPlugin main;
public StructurePopulator(TerraPlugin main) { public StructurePopulator(TerraPlugin main) {
@@ -8,9 +8,9 @@ import com.dfsek.terra.api.util.PopulationUtil;
import com.dfsek.terra.api.vector.Vector3; import com.dfsek.terra.api.vector.Vector3;
import com.dfsek.terra.api.world.Chunk; import com.dfsek.terra.api.world.Chunk;
import com.dfsek.terra.api.world.World; import com.dfsek.terra.api.world.World;
import com.dfsek.terra.api.world.generator.TerraGenerationStage; import com.dfsek.terra.api.world.generator.GenerationStage;
public class FeatureGenerationStage implements TerraGenerationStage { public class FeatureGenerationStage implements GenerationStage {
private final TerraPlugin main; private final TerraPlugin main;
public FeatureGenerationStage(TerraPlugin main) { public FeatureGenerationStage(TerraPlugin main) {
@@ -7,7 +7,7 @@ import com.dfsek.terra.api.vector.Vector2;
import com.dfsek.terra.api.world.Chunk; import com.dfsek.terra.api.world.Chunk;
import com.dfsek.terra.api.world.World; import com.dfsek.terra.api.world.World;
import com.dfsek.terra.api.world.biome.generation.BiomeProvider; import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
import com.dfsek.terra.api.world.generator.TerraGenerationStage; import com.dfsek.terra.api.world.generator.GenerationStage;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import java.util.HashMap; import java.util.HashMap;
@@ -18,7 +18,7 @@ import java.util.Random;
/** /**
* Populates Flora * Populates Flora
*/ */
public class FloraGenerationStage implements TerraGenerationStage { public class FloraGenerationStage implements GenerationStage {
private final TerraPlugin main; private final TerraPlugin main;
public FloraGenerationStage(TerraPlugin main) { public FloraGenerationStage(TerraPlugin main) {
@@ -3,6 +3,6 @@ package com.dfsek.terra.api.world.generator;
import com.dfsek.terra.api.world.Chunk; import com.dfsek.terra.api.world.Chunk;
import com.dfsek.terra.api.world.World; import com.dfsek.terra.api.world.World;
public interface TerraGenerationStage { public interface GenerationStage {
void populate(World world, Chunk chunk); void populate(World world, Chunk chunk);
} }
@@ -3,5 +3,5 @@ package com.dfsek.terra.api.world.generator;
import com.dfsek.terra.api.config.ConfigPack; import com.dfsek.terra.api.config.ConfigPack;
public interface GenerationStageProvider { public interface GenerationStageProvider {
TerraGenerationStage newInstance(ConfigPack pack); GenerationStage newInstance(ConfigPack pack);
} }
@@ -23,7 +23,7 @@ public interface TerraChunkGenerator {
Sampler createSampler(int chunkX, int chunkZ, BiomeProvider provider, World world, int elevationSmooth); Sampler createSampler(int chunkX, int chunkZ, BiomeProvider provider, World world, int elevationSmooth);
List<TerraGenerationStage> getGenerationStages(); List<GenerationStage> getGenerationStages();
BlockState getBlock(World world, int x, int y, int z); BlockState getBlock(World world, int x, int y, int z);