diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/BiomePipelineAddon.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/BiomePipelineAddon.java index bf4b156e4..6ff34120b 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/BiomePipelineAddon.java +++ b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/BiomePipelineAddon.java @@ -22,9 +22,9 @@ import com.dfsek.terra.api.event.EventListener; import com.dfsek.terra.api.event.events.config.pack.ConfigPackPreLoadEvent; import com.dfsek.terra.api.injection.annotations.Inject; import com.dfsek.terra.api.util.TypeToken; -import com.dfsek.terra.api.util.seeded.SeededBiomeSource; import com.dfsek.terra.api.util.seeded.SeededBuilder; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; +import com.dfsek.terra.api.world.biome.generation.pipeline.BiomeSource; import java.lang.reflect.Type; @@ -36,6 +36,7 @@ public class BiomePipelineAddon extends TerraAddon implements EventListener { private TerraPlugin main; public static final TypeToken> BIOME_PROVIDER_BUILDER_TOKEN = new TypeToken<>(){}; + public static final TypeToken> BIOME_SOURCE_BUILDER_TOKEN = new TypeToken<>(){}; @Override public void initialize() { @@ -43,7 +44,7 @@ public class BiomePipelineAddon extends TerraAddon implements EventListener { } public void onPackLoad(ConfigPackPreLoadEvent event) { - event.getPack().applyLoader(SeededBiomeSource.class, new SourceBuilderLoader()) + event.getPack().applyLoader(BIOME_SOURCE_BUILDER_TOKEN.getType(), new SourceBuilderLoader()) .applyLoader(StageSeeded.class, new StageBuilderLoader()) .applyLoader(ExpanderStage.Type.class, (c, o, l) -> ExpanderStage.Type.valueOf((String) o)) .applyLoader(MutatorStage.Type.class, (c, o, l) -> MutatorStage.Type.valueOf((String) o)) diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/BiomePipelineTemplate.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/BiomePipelineTemplate.java index c226c8ef7..4dcadb2a6 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/BiomePipelineTemplate.java +++ b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/BiomePipelineTemplate.java @@ -6,8 +6,9 @@ import com.dfsek.terra.addons.biome.pipeline.BiomePipelineImpl; import com.dfsek.terra.addons.biome.pipeline.StageSeeded; import com.dfsek.terra.addons.biome.pipeline.StandardBiomeProvider; import com.dfsek.terra.api.TerraPlugin; -import com.dfsek.terra.api.util.seeded.SeededBiomeSource; +import com.dfsek.terra.api.util.seeded.SeededBuilder; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; +import com.dfsek.terra.api.world.biome.generation.pipeline.BiomeSource; import java.util.List; @@ -22,7 +23,7 @@ public class BiomePipelineTemplate extends BiomeProviderTemplate { private List stages; @Value("pipeline.source") - private SeededBiomeSource source; + private SeededBuilder source; public BiomePipelineTemplate(TerraPlugin main) { this.main = main; diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/SourceBuilderLoader.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/SourceBuilderLoader.java index b2bd0b58e..3dd500673 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/SourceBuilderLoader.java +++ b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/SourceBuilderLoader.java @@ -3,16 +3,16 @@ package com.dfsek.terra.addons.biome.pipeline.config; import com.dfsek.tectonic.exception.LoadException; import com.dfsek.tectonic.loading.ConfigLoader; import com.dfsek.tectonic.loading.TypeLoader; -import com.dfsek.terra.api.util.seeded.SeededBiomeSource; +import com.dfsek.terra.api.util.seeded.SeededBuilder; import com.dfsek.terra.api.world.biome.generation.pipeline.BiomeSource; import java.lang.reflect.AnnotatedType; import java.util.Map; @SuppressWarnings("unchecked") -public class SourceBuilderLoader implements TypeLoader { +public class SourceBuilderLoader implements TypeLoader> { @Override - public SeededBiomeSource load(AnnotatedType t, Object c, ConfigLoader loader) throws LoadException { + public SeededBuilder load(AnnotatedType t, Object c, ConfigLoader loader) throws LoadException { Map source = (Map) c; BiomeSource.Type type = loader.loadType(BiomeSource.Type.class, source.get("type")); diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/SourceTemplate.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/SourceTemplate.java index 1232dcbdd..10935d983 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/SourceTemplate.java +++ b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/SourceTemplate.java @@ -1,11 +1,12 @@ package com.dfsek.terra.addons.biome.pipeline.config; import com.dfsek.tectonic.loading.object.ObjectTemplate; -import com.dfsek.terra.api.util.seeded.SeededBiomeSource; +import com.dfsek.terra.api.util.seeded.SeededBuilder; +import com.dfsek.terra.api.world.biome.generation.pipeline.BiomeSource; -public abstract class SourceTemplate implements ObjectTemplate, SeededBiomeSource { +public abstract class SourceTemplate implements ObjectTemplate>, SeededBuilder { @Override - public SeededBiomeSource get() { + public SeededBuilder get() { return this; } } diff --git a/common/api/src/main/java/com/dfsek/terra/api/util/seeded/SeededBiomeSource.java b/common/api/src/main/java/com/dfsek/terra/api/util/seeded/SeededBiomeSource.java deleted file mode 100644 index 86d72208c..000000000 --- a/common/api/src/main/java/com/dfsek/terra/api/util/seeded/SeededBiomeSource.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.dfsek.terra.api.util.seeded; - -import com.dfsek.terra.api.world.biome.generation.pipeline.BiomeSource; - -@FunctionalInterface -public interface SeededBiomeSource extends SeededBuilder { -}