clean up biome and structure things

This commit is contained in:
dfsek
2021-07-08 06:18:16 -07:00
parent e1abc67989
commit 6ca9ba029b
11 changed files with 26 additions and 41 deletions
@@ -8,7 +8,7 @@ import com.dfsek.terra.api.util.seeded.BiomeBuilder;
import java.awt.image.BufferedImage;
import java.util.stream.Collectors;
public class ImageProviderTemplate extends BiomeProviderTemplate {
public class ImageProviderTemplate /*extends BiomeProviderTemplate */{
private final Registry<BiomeBuilder> biomes;
@Value("image.name")
private BufferedImage image;
@@ -16,11 +16,13 @@ public class ImageProviderTemplate extends BiomeProviderTemplate {
@Value("image.align")
private ImageBiomeProvider.Align align;
private int resolution;
public ImageProviderTemplate(Registry<BiomeBuilder> set) {
this.biomes = set;
}
@Override
//@Override
public BiomeProvider build(long seed) {
return new ImageBiomeProvider(biomes.entries().stream().map(biomeBuilder -> biomeBuilder.apply(seed)).collect(Collectors.toSet()), image, resolution, align);
}
@@ -1,18 +1,22 @@
package com.dfsek.terra.addons.biome.single;
import com.dfsek.tectonic.annotations.Value;
import com.dfsek.tectonic.loading.object.ObjectTemplate;
import com.dfsek.terra.api.util.seeded.BiomeProviderBuilder;
import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
import com.dfsek.terra.api.util.seeded.BiomeBuilder;
public class SingleBiomeProviderTemplate extends BiomeProviderTemplate {
public class SingleBiomeProviderTemplate implements ObjectTemplate<BiomeProviderBuilder>, BiomeProviderBuilder {
@Value("biome")
private BiomeBuilder biome;
public SingleBiomeProviderTemplate() {
}
@Override
public BiomeProvider build(long seed) {
return new SingleBiomeProvider(biome.apply(seed));
}
@Override
public BiomeProviderBuilder get() {
return this;
}
}