Biome -> PlatformBiome

This commit is contained in:
dfsek
2021-12-04 17:46:26 -07:00
parent 4d2639207d
commit 16c80a0976
10 changed files with 31 additions and 27 deletions

View File

@@ -27,7 +27,7 @@ import com.dfsek.terra.api.config.ConfigPack;
import com.dfsek.terra.api.config.meta.Meta;
import com.dfsek.terra.api.noise.NoiseSampler;
import com.dfsek.terra.api.util.collection.ProbabilityCollection;
import com.dfsek.terra.api.world.biome.Biome;
import com.dfsek.terra.api.world.biome.PlatformBiome;
import com.dfsek.terra.api.world.chunk.generation.util.Palette;
@@ -53,7 +53,7 @@ public class BiomeTemplate implements AbstractableTemplate, ValidatedConfigTempl
private @Meta NoiseSampler carvingEquation = NoiseSampler.zero();
@Value("vanilla")
private @Meta ProbabilityCollection<Biome> vanilla;
private @Meta ProbabilityCollection<PlatformBiome> vanilla;
@Value("biome-noise")
@Default
@@ -198,7 +198,7 @@ public class BiomeTemplate implements AbstractableTemplate, ValidatedConfigTempl
return id;
}
public ProbabilityCollection<Biome> getVanilla() {
public ProbabilityCollection<PlatformBiome> getVanilla() {
return vanilla;
}

View File

@@ -11,7 +11,7 @@ import java.util.Set;
import com.dfsek.terra.api.properties.Context;
import com.dfsek.terra.api.util.collection.ProbabilityCollection;
import com.dfsek.terra.api.world.biome.Biome;
import com.dfsek.terra.api.world.biome.PlatformBiome;
import com.dfsek.terra.api.world.biome.GenerationSettings;
import com.dfsek.terra.api.world.biome.TerraBiome;
@@ -21,7 +21,7 @@ import com.dfsek.terra.api.world.biome.TerraBiome;
*/
public class UserDefinedBiome implements TerraBiome {
private final UserDefinedGenerationSettings gen;
private final ProbabilityCollection<Biome> vanilla;
private final ProbabilityCollection<PlatformBiome> vanilla;
private final String id;
private final BiomeTemplate config;
private final int color;
@@ -29,7 +29,7 @@ public class UserDefinedBiome implements TerraBiome {
private final Context context = new Context();
public UserDefinedBiome(ProbabilityCollection<Biome> vanilla, UserDefinedGenerationSettings gen, BiomeTemplate config) {
public UserDefinedBiome(ProbabilityCollection<PlatformBiome> vanilla, UserDefinedGenerationSettings gen, BiomeTemplate config) {
this.vanilla = vanilla;
this.gen = gen;
this.id = config.getID();
@@ -50,7 +50,7 @@ public class UserDefinedBiome implements TerraBiome {
* @return Collection of biomes to represent the custom biome.
*/
@Override
public ProbabilityCollection<Biome> getVanillaBiomes() {
public ProbabilityCollection<PlatformBiome> getVanillaBiomes() {
return vanilla;
}

View File

@@ -10,5 +10,5 @@ package com.dfsek.terra.api.world.biome;
import com.dfsek.terra.api.Handle;
public interface Biome extends Handle {
public interface PlatformBiome extends Handle {
}

View File

@@ -24,7 +24,7 @@ public interface TerraBiome extends PropertyHolder {
*
* @return TerraBiome - The Vanilla biome.
*/
ProbabilityCollection<Biome> getVanillaBiomes();
ProbabilityCollection<PlatformBiome> getVanillaBiomes();
/**
* Gets the BiomeTerrain instance used to generate the biome.