mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2026-06-19 15:20:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

SourceSeeded -> SeededBiomeSource

Browse Source
This commit is contained in:
dfsek
2021-07-17 21:37:12 -07:00
parent 84e7d11156
commit 689fe0bc70
5 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/BiomePipelineAddon.java
+2 -2
View File
@@ -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.event.events.config.pack.ConfigPackPreLoadEvent;
import com.dfsek.terra.api.injection.annotations.Inject; import com.dfsek.terra.api.injection.annotations.Inject;
import com.dfsek.terra.api.util.seeded.BiomeProviderBuilder; 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; import java.lang.reflect.Type;
@@ -39,7 +39,7 @@ public class BiomePipelineAddon extends TerraAddon implements EventListener {
} }
public void onPackLoad(ConfigPackPreLoadEvent event) { 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(StageSeeded.class, new StageBuilderLoader())
.applyLoader(ExpanderStage.Type.class, (c, o, l) -> ExpanderStage.Type.valueOf((String) o)) .applyLoader(ExpanderStage.Type.class, (c, o, l) -> ExpanderStage.Type.valueOf((String) o))
.applyLoader(MutatorStage.Type.class, (c, o, l) -> MutatorStage.Type.valueOf((String) o)) .applyLoader(MutatorStage.Type.class, (c, o, l) -> MutatorStage.Type.valueOf((String) o))
common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/BiomePipelineTemplate.java
+2 -2
View File
@@ -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.StageSeeded;
import com.dfsek.terra.addons.biome.pipeline.StandardBiomeProvider; import com.dfsek.terra.addons.biome.pipeline.StandardBiomeProvider;
import com.dfsek.terra.api.TerraPlugin; 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 com.dfsek.terra.api.world.biome.generation.BiomeProvider;
import java.util.List; import java.util.List;
@@ -22,7 +22,7 @@ public class BiomePipelineTemplate extends BiomeProviderTemplate {
private List<StageSeeded> stages; private List<StageSeeded> stages;
@Value("pipeline.source") @Value("pipeline.source")
private SourceSeeded source; private SeededBiomeSource source;
public BiomePipelineTemplate(TerraPlugin main) { public BiomePipelineTemplate(TerraPlugin main) {
this.main = main; this.main = main;
common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/SourceBuilderLoader.java
+3 -4
View File
@@ -3,17 +3,16 @@ package com.dfsek.terra.addons.biome.pipeline.config;
import com.dfsek.tectonic.exception.LoadException; import com.dfsek.tectonic.exception.LoadException;
import com.dfsek.tectonic.loading.ConfigLoader; import com.dfsek.tectonic.loading.ConfigLoader;
import com.dfsek.tectonic.loading.TypeLoader; 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 com.dfsek.terra.api.world.biome.generation.pipeline.BiomeSource;
import java.lang.reflect.AnnotatedType; import java.lang.reflect.AnnotatedType;
import java.lang.reflect.Type;
import java.util.Map; import java.util.Map;
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public class SourceBuilderLoader implements TypeLoader<SourceSeeded> { public class SourceBuilderLoader implements TypeLoader<SeededBiomeSource> {
@Override @Override
public SourceSeeded load(AnnotatedType t, Object c, ConfigLoader loader) throws LoadException { public SeededBiomeSource load(AnnotatedType t, Object c, ConfigLoader loader) throws LoadException {
Map<String, Object> source = (Map<String, Object>) c; Map<String, Object> source = (Map<String, Object>) c;
BiomeSource.Type type = loader.loadType(BiomeSource.Type.class, source.get("type")); BiomeSource.Type type = loader.loadType(BiomeSource.Type.class, source.get("type"));
common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/SourceTemplate.java
+3 -3
View File
@@ -1,11 +1,11 @@
package com.dfsek.terra.addons.biome.pipeline.config; package com.dfsek.terra.addons.biome.pipeline.config;
import com.dfsek.tectonic.loading.object.ObjectTemplate; 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>, SourceSeeded { public abstract class SourceTemplate implements ObjectTemplate<SeededBiomeSource>, SeededBiomeSource {
@Override @Override
public SourceSeeded get() { public SeededBiomeSource get() {
return this; return this;
} }
} }
common/api/src/main/java/com/dfsek/terra/api/util/seeded/SourceSeeded.java → common/api/src/main/java/com/dfsek/terra/api/util/seeded/SeededBiomeSource.java
+1 -1
View File
@@ -3,5 +3,5 @@ package com.dfsek.terra.api.util.seeded;
import com.dfsek.terra.api.world.biome.generation.pipeline.BiomeSource; import com.dfsek.terra.api.world.biome.generation.pipeline.BiomeSource;
@FunctionalInterface @FunctionalInterface
public interface SourceSeeded extends SeededBuilder<BiomeSource> { public interface SeededBiomeSource extends SeededBuilder<BiomeSource> {
} }