diff --git a/common/addons/biome/provider/image/src/main/java/com/dfsek/terra/addons/biome/image/ImageBiomeProvider.java b/common/addons/biome/provider/image/src/main/java/com/dfsek/terra/addons/biome/image/ImageBiomeProvider.java index cde1bebd9..313d4c074 100644 --- a/common/addons/biome/provider/image/src/main/java/com/dfsek/terra/addons/biome/image/ImageBiomeProvider.java +++ b/common/addons/biome/provider/image/src/main/java/com/dfsek/terra/addons/biome/image/ImageBiomeProvider.java @@ -2,6 +2,7 @@ package com.dfsek.terra.addons.biome.image; import com.dfsek.terra.api.world.biome.TerraBiome; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; +import com.dfsek.terra.api.util.seeded.BiomeProviderBuilder; import net.jafama.FastMath; import java.awt.*; @@ -10,7 +11,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Set; -public class ImageBiomeProvider implements BiomeProvider, BiomeProvider.BiomeProviderBuilder { // This provider does not need a seed, so it is its own builder. +public class ImageBiomeProvider implements BiomeProvider, BiomeProviderBuilder { // This provider does not need a seed, so it is its own builder. private final Map colorBiomeMap = new HashMap<>(); private final BufferedImage image; private final int resolution; diff --git a/common/addons/biome/provider/single/src/main/java/com/dfsek/terra/addons/biome/single/SingleBiomeProvider.java b/common/addons/biome/provider/single/src/main/java/com/dfsek/terra/addons/biome/single/SingleBiomeProvider.java index 136a4555c..25fae9429 100644 --- a/common/addons/biome/provider/single/src/main/java/com/dfsek/terra/addons/biome/single/SingleBiomeProvider.java +++ b/common/addons/biome/provider/single/src/main/java/com/dfsek/terra/addons/biome/single/SingleBiomeProvider.java @@ -2,8 +2,9 @@ package com.dfsek.terra.addons.biome.single; import com.dfsek.terra.api.world.biome.TerraBiome; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; +import com.dfsek.terra.api.util.seeded.BiomeProviderBuilder; -public class SingleBiomeProvider implements BiomeProvider, BiomeProvider.BiomeProviderBuilder { +public class SingleBiomeProvider implements BiomeProvider, BiomeProviderBuilder { private final TerraBiome biome; public SingleBiomeProvider(TerraBiome biome) { diff --git a/common/api/src/main/java/com/dfsek/terra/api/config/ConfigPack.java b/common/api/src/main/java/com/dfsek/terra/api/config/ConfigPack.java index 25543703c..f86432877 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/config/ConfigPack.java +++ b/common/api/src/main/java/com/dfsek/terra/api/config/ConfigPack.java @@ -7,7 +7,7 @@ import com.dfsek.terra.api.tectonic.LoaderRegistrar; import com.dfsek.terra.api.addon.TerraAddon; import com.dfsek.terra.api.registry.CheckedRegistry; import com.dfsek.terra.api.world.TerraWorld; -import com.dfsek.terra.api.world.biome.generation.BiomeProvider; +import com.dfsek.terra.api.util.seeded.BiomeProviderBuilder; import java.util.Map; import java.util.Set; @@ -15,7 +15,7 @@ import java.util.Set; public interface ConfigPack extends LoaderRegistrar, LoaderHolder, RegistryHolder { CheckedRegistry getRegistry(Class clazz); - BiomeProvider.BiomeProviderBuilder getBiomeProviderBuilder(); + BiomeProviderBuilder getBiomeProviderBuilder(); WorldConfig toWorldConfig(TerraWorld world); diff --git a/common/api/src/main/java/com/dfsek/terra/api/util/seeded/BiomeProviderBuilder.java b/common/api/src/main/java/com/dfsek/terra/api/util/seeded/BiomeProviderBuilder.java new file mode 100644 index 000000000..0d1e05dbe --- /dev/null +++ b/common/api/src/main/java/com/dfsek/terra/api/util/seeded/BiomeProviderBuilder.java @@ -0,0 +1,7 @@ +package com.dfsek.terra.api.util.seeded; + +import com.dfsek.terra.api.world.biome.generation.BiomeProvider; + +public interface BiomeProviderBuilder { + BiomeProvider build(long seed); +} diff --git a/common/api/src/main/java/com/dfsek/terra/api/world/biome/generation/BiomeProvider.java b/common/api/src/main/java/com/dfsek/terra/api/world/biome/generation/BiomeProvider.java index d731e12c9..c42557317 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/world/biome/generation/BiomeProvider.java +++ b/common/api/src/main/java/com/dfsek/terra/api/world/biome/generation/BiomeProvider.java @@ -15,10 +15,6 @@ public interface BiomeProvider { return getBiome(vector3.getBlockX(), vector3.getBlockZ()); } - interface BiomeProviderBuilder { - BiomeProvider build(long seed); - } - @Deprecated enum Type { IMAGE, PIPELINE, SINGLE diff --git a/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/provider/BiomeProviderTemplate.java b/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/provider/BiomeProviderTemplate.java index 015b19fba..8befb69b7 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/provider/BiomeProviderTemplate.java +++ b/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/provider/BiomeProviderTemplate.java @@ -4,9 +4,9 @@ import com.dfsek.tectonic.annotations.Default; import com.dfsek.tectonic.annotations.Value; import com.dfsek.tectonic.loading.object.ObjectTemplate; import com.dfsek.terra.api.util.seeded.NoiseSeeded; -import com.dfsek.terra.api.world.biome.generation.BiomeProvider; +import com.dfsek.terra.api.util.seeded.BiomeProviderBuilder; -public abstract class BiomeProviderTemplate implements ObjectTemplate, BiomeProvider.BiomeProviderBuilder { +public abstract class BiomeProviderTemplate implements ObjectTemplate, BiomeProviderBuilder { @Value("resolution") @Default protected int resolution = 1; @@ -16,11 +16,9 @@ public abstract class BiomeProviderTemplate implements ObjectTemplate