TerraBiome -> Biome

This commit is contained in:
dfsek
2021-12-04 17:47:41 -07:00
parent 16c80a0976
commit 2ef2b61cc5
45 changed files with 193 additions and 191 deletions
@@ -7,6 +7,7 @@
package com.dfsek.terra.addons.biome.image;
import com.dfsek.terra.api.world.biome.Biome;
import net.jafama.FastMath;
import java.awt.Color;
@@ -15,17 +16,16 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Set;
import com.dfsek.terra.api.world.biome.TerraBiome;
import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
public class ImageBiomeProvider implements BiomeProvider {
private final Map<Color, TerraBiome> colorBiomeMap = new HashMap<>();
private final Map<Color, Biome> colorBiomeMap = new HashMap<>();
private final BufferedImage image;
private final int resolution;
private final Align align;
public ImageBiomeProvider(Set<TerraBiome> registry, BufferedImage image, int resolution, Align align) {
public ImageBiomeProvider(Set<Biome> registry, BufferedImage image, int resolution, Align align) {
this.image = image;
this.resolution = resolution;
this.align = align;
@@ -37,7 +37,7 @@ public class ImageBiomeProvider implements BiomeProvider {
}
@Override
public TerraBiome getBiome(int x, int z, long seed) {
public Biome getBiome(int x, int z, long seed) {
x /= resolution;
z /= resolution;
Color color = align.getColor(image, x, z);
@@ -52,7 +52,7 @@ public class ImageBiomeProvider implements BiomeProvider {
}
@Override
public Iterable<TerraBiome> getBiomes() {
public Iterable<Biome> getBiomes() {
return colorBiomeMap.values();
}
@@ -19,7 +19,7 @@ import com.dfsek.terra.api.event.functional.FunctionalEventHandler;
import com.dfsek.terra.api.inject.annotations.Inject;
import com.dfsek.terra.api.registry.CheckedRegistry;
import com.dfsek.terra.api.util.reflection.TypeKey;
import com.dfsek.terra.api.world.biome.TerraBiome;
import com.dfsek.terra.api.world.biome.Biome;
import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
@@ -41,7 +41,7 @@ public class ImageBiomeProviderAddon implements AddonInitializer {
.then(event -> {
CheckedRegistry<Supplier<ObjectTemplate<BiomeProvider>>> providerRegistry = event.getPack().getOrCreateRegistry(
PROVIDER_REGISTRY_KEY);
providerRegistry.register("IMAGE", () -> new ImageProviderTemplate(event.getPack().getRegistry(TerraBiome.class)));
providerRegistry.register("IMAGE", () -> new ImageProviderTemplate(event.getPack().getRegistry(Biome.class)));
})
.failThrough();
}
@@ -15,13 +15,13 @@ import java.awt.image.BufferedImage;
import java.util.HashSet;
import com.dfsek.terra.api.registry.Registry;
import com.dfsek.terra.api.world.biome.TerraBiome;
import com.dfsek.terra.api.world.biome.Biome;
import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
@SuppressWarnings("FieldMayBeFinal")
public class ImageProviderTemplate implements ObjectTemplate<BiomeProvider> {
private final Registry<TerraBiome> biomes;
private final Registry<Biome> biomes;
@Value("resolution")
@Default
private int resolution = 1;
@@ -30,7 +30,7 @@ public class ImageProviderTemplate implements ObjectTemplate<BiomeProvider> {
@Value("image.align")
private ImageBiomeProvider.Align align;
public ImageProviderTemplate(Registry<TerraBiome> set) {
public ImageProviderTemplate(Registry<Biome> set) {
this.biomes = set;
}