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

remove SeededTerraBiome

Browse Source
This commit is contained in:
dfsek
2021-07-19 21:35:53 -07:00
parent 458fc422de
commit 03e4636ef9
19 changed files with 45 additions and 82 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/config/NoiseSourceTemplate.java
+3 -3
View File
@@ -4,7 +4,7 @@ import com.dfsek.tectonic.annotations.Value;
import com.dfsek.terra.addons.biome.pipeline.source.RandomSource;
import com.dfsek.terra.api.noise.NoiseSampler;
import com.dfsek.terra.api.util.collection.ProbabilityCollection;
import com.dfsek.terra.api.util.seeded.SeededTerraBiome;
import com.dfsek.terra.api.world.biome.TerraBiome;
import com.dfsek.terra.api.world.biome.generation.pipeline.BiomeSource;
public class NoiseSourceTemplate extends SourceTemplate {
@@ -12,10 +12,10 @@ public class NoiseSourceTemplate extends SourceTemplate {
private NoiseSampler noise;
@Value("biomes")
private ProbabilityCollection<SeededTerraBiome> biomes;
private ProbabilityCollection<TerraBiome> biomes;
@Override
public BiomeSource build(long seed) {
return new RandomSource(biomes.map((biome) -> biome.build(seed), false), noise);
return new RandomSource(biomes, noise);
}
}
common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/mutator/BorderListMutatorTemplate.java
+3 -9
View File
@@ -4,10 +4,8 @@ import com.dfsek.tectonic.annotations.Value;
import com.dfsek.terra.addons.biome.pipeline.api.BiomeMutator;
import com.dfsek.terra.addons.biome.pipeline.mutator.BorderListMutator;
import com.dfsek.terra.api.util.collection.ProbabilityCollection;
import com.dfsek.terra.api.util.seeded.SeededTerraBiome;
import com.dfsek.terra.api.world.biome.TerraBiome;
import java.util.HashMap;
import java.util.Map;
@SuppressWarnings("unused")
@@ -19,18 +17,14 @@ public class BorderListMutatorTemplate extends MutatorStageTemplate {
private String defaultReplace;
@Value("default-to")
private ProbabilityCollection<SeededTerraBiome> defaultTo;
private ProbabilityCollection<TerraBiome> defaultTo;
@Value("replace")
private Map<SeededTerraBiome, ProbabilityCollection<SeededTerraBiome>> replace;
private Map<TerraBiome, ProbabilityCollection<TerraBiome>> replace;
@Override
public BiomeMutator getMutator(long seed) {
Map<TerraBiome, ProbabilityCollection<TerraBiome>> replaceMap = new HashMap<>();
replace.forEach((keyBuilder, replacements) -> replaceMap.put(keyBuilder.build(seed), replacements.map(replacement -> replacement.build(seed), true)));
return new BorderListMutator(replaceMap, from, defaultReplace, noise, defaultTo.map(biomeBuilder -> biomeBuilder.build(seed), true));
return new BorderListMutator(replace, from, defaultReplace, noise, defaultTo);
}
}
common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/mutator/BorderMutatorTemplate.java
+3 -3
View File
@@ -4,7 +4,7 @@ import com.dfsek.tectonic.annotations.Value;
import com.dfsek.terra.addons.biome.pipeline.api.BiomeMutator;
import com.dfsek.terra.addons.biome.pipeline.mutator.BorderMutator;
import com.dfsek.terra.api.util.collection.ProbabilityCollection;
import com.dfsek.terra.api.util.seeded.SeededTerraBiome;
import com.dfsek.terra.api.world.biome.TerraBiome;
@SuppressWarnings("unused")
public class BorderMutatorTemplate extends MutatorStageTemplate {
@@ -15,10 +15,10 @@ public class BorderMutatorTemplate extends MutatorStageTemplate {
private String replace;
@Value("to")
private ProbabilityCollection<SeededTerraBiome> to;
private ProbabilityCollection<TerraBiome> to;
@Override
public BiomeMutator getMutator(long seed) {
return new BorderMutator(from, replace, noise, to.map(biomeBuilder -> biomeBuilder.build(seed), true));
return new BorderMutator(from, replace, noise, to);
}
}
common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/mutator/ReplaceListMutatorTemplate.java
+3 -9
View File
@@ -4,10 +4,8 @@ import com.dfsek.tectonic.annotations.Value;
import com.dfsek.terra.addons.biome.pipeline.api.BiomeMutator;
import com.dfsek.terra.addons.biome.pipeline.mutator.ReplaceListMutator;
import com.dfsek.terra.api.util.collection.ProbabilityCollection;
import com.dfsek.terra.api.util.seeded.SeededTerraBiome;
import com.dfsek.terra.api.world.biome.TerraBiome;
import java.util.HashMap;
import java.util.Map;
@SuppressWarnings("unused")
@@ -16,17 +14,13 @@ public class ReplaceListMutatorTemplate extends MutatorStageTemplate {
private String defaultFrom;
@Value("default-to")
private ProbabilityCollection<SeededTerraBiome> defaultTo;
private ProbabilityCollection<TerraBiome> defaultTo;
@Value("to")
private Map<SeededTerraBiome, ProbabilityCollection<SeededTerraBiome>> replace;
private Map<TerraBiome, ProbabilityCollection<TerraBiome>> replace;
@Override
public BiomeMutator getMutator(long seed) {
Map<TerraBiome, ProbabilityCollection<TerraBiome>> replaceMap = new HashMap<>();
replace.forEach((biomeBuilder, biomeBuilders) -> replaceMap.put(biomeBuilder.build(seed), biomeBuilders.map(builder -> builder.build(seed), true)));
return new ReplaceListMutator(replaceMap, defaultFrom, defaultTo.map(biomeBuilder -> biomeBuilder.build(seed), true), noise);
return new ReplaceListMutator(replace, defaultFrom, defaultTo, noise);
}
}
common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/mutator/ReplaceMutatorTemplate.java
+3 -3
View File
@@ -4,7 +4,7 @@ import com.dfsek.tectonic.annotations.Value;
import com.dfsek.terra.addons.biome.pipeline.api.BiomeMutator;
import com.dfsek.terra.addons.biome.pipeline.mutator.ReplaceMutator;
import com.dfsek.terra.api.util.collection.ProbabilityCollection;
import com.dfsek.terra.api.util.seeded.SeededTerraBiome;
import com.dfsek.terra.api.world.biome.TerraBiome;
@SuppressWarnings("unused")
public class ReplaceMutatorTemplate extends MutatorStageTemplate {
@@ -12,10 +12,10 @@ public class ReplaceMutatorTemplate extends MutatorStageTemplate {
private String from;
@Value("to")
private ProbabilityCollection<SeededTerraBiome> to;
private ProbabilityCollection<TerraBiome> to;
@Override
public BiomeMutator getMutator(long seed) {
return new ReplaceMutator(from, to.map(biomeBuilder -> biomeBuilder.build(seed), true), noise);
return new ReplaceMutator(from, to, noise);
}
}