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 e82f990d0..b6d03c0a7 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,7 +22,7 @@ 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.seeded.BiomeProviderBuilder; -import com.dfsek.terra.api.util.seeded.SourceSeeded; +import com.dfsek.terra.api.util.seeded.SeededBiomeSource; import java.lang.reflect.Type; @@ -39,7 +39,7 @@ public class BiomePipelineAddon extends TerraAddon implements EventListener { } public void onPackLoad(ConfigPackPreLoadEvent event) { - event.getPack().applyLoader(SourceSeeded.class, new SourceBuilderLoader()) + event.getPack().applyLoader(SeededBiomeSource.class, 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 80708faef..4916cb6be 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,7 +6,7 @@ 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.SourceSeeded; +import com.dfsek.terra.api.util.seeded.SeededBiomeSource; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; import java.util.List; @@ -22,7 +22,7 @@ public class BiomePipelineTemplate extends BiomeProviderTemplate { private List stages; @Value("pipeline.source") - private SourceSeeded source; + private SeededBiomeSource 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 bb0a082de..b2bd0b58e 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,17 +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.SourceSeeded; +import com.dfsek.terra.api.util.seeded.SeededBiomeSource; import com.dfsek.terra.api.world.biome.generation.pipeline.BiomeSource; import java.lang.reflect.AnnotatedType; -import java.lang.reflect.Type; import java.util.Map; @SuppressWarnings("unchecked") -public class SourceBuilderLoader implements TypeLoader { +public class SourceBuilderLoader implements TypeLoader { @Override - public SourceSeeded load(AnnotatedType t, Object c, ConfigLoader loader) throws LoadException { + public SeededBiomeSource 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 e3c9333c6..1232dcbdd 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,11 @@ package com.dfsek.terra.addons.biome.pipeline.config; import com.dfsek.tectonic.loading.object.ObjectTemplate; -import com.dfsek.terra.api.util.seeded.SourceSeeded; +import com.dfsek.terra.api.util.seeded.SeededBiomeSource; -public abstract class SourceTemplate implements ObjectTemplate, SourceSeeded { +public abstract class SourceTemplate implements ObjectTemplate, SeededBiomeSource { @Override - public SourceSeeded get() { + public SeededBiomeSource get() { return this; } } diff --git a/common/api/src/main/java/com/dfsek/terra/api/util/seeded/SourceSeeded.java b/common/api/src/main/java/com/dfsek/terra/api/util/seeded/SeededBiomeSource.java similarity index 65% rename from common/api/src/main/java/com/dfsek/terra/api/util/seeded/SourceSeeded.java rename to common/api/src/main/java/com/dfsek/terra/api/util/seeded/SeededBiomeSource.java index 5f1d03f95..86d72208c 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/util/seeded/SourceSeeded.java +++ b/common/api/src/main/java/com/dfsek/terra/api/util/seeded/SeededBiomeSource.java @@ -3,5 +3,5 @@ package com.dfsek.terra.api.util.seeded; import com.dfsek.terra.api.world.biome.generation.pipeline.BiomeSource; @FunctionalInterface -public interface SourceSeeded extends SeededBuilder { +public interface SeededBiomeSource extends SeededBuilder { }