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

TerraBiome -> Biome

Browse Source
This commit is contained in:
dfsek
2021-12-04 17:47:41 -07:00
parent 16c80a0976
commit 2ef2b61cc5
45 changed files with 193 additions and 191 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/BiomeHolderImpl.java
+8 -8
View File
@@ -12,24 +12,24 @@ import com.dfsek.terra.addons.biome.pipeline.api.BiomeHolder;
import com.dfsek.terra.addons.biome.pipeline.api.BiomeMutator;
import com.dfsek.terra.addons.biome.pipeline.source.BiomeSource;
import com.dfsek.terra.api.util.vector.Vector2;
import com.dfsek.terra.api.world.biome.TerraBiome;
import com.dfsek.terra.api.world.biome.Biome;
public class BiomeHolderImpl implements BiomeHolder {
private final Vector2 origin;
private final int width;
private final int offset;
private TerraBiome[][] biomes;
private Biome[][] biomes;
public BiomeHolderImpl(int width, Vector2 origin) {
width += 4;
this.width = width;
biomes = new TerraBiome[width][width];
biomes = new Biome[width][width];
this.origin = origin;
this.offset = 2;
}
private BiomeHolderImpl(TerraBiome[][] biomes, Vector2 origin, int width, int offset) {
private BiomeHolderImpl(Biome[][] biomes, Vector2 origin, int width, int offset) {
this.biomes = biomes;
this.origin = origin;
this.width = width;
@@ -38,10 +38,10 @@ public class BiomeHolderImpl implements BiomeHolder {
@Override
public BiomeHolder expand(BiomeExpander expander, long seed) {
TerraBiome[][] old = biomes;
Biome[][] old = biomes;
int newWidth = width * 2 - 1;
biomes = new TerraBiome[newWidth][newWidth];
biomes = new Biome[newWidth][newWidth];
for(int x = 0; x < width; x++) {
for(int z = 0; z < width; z++) {
@@ -80,14 +80,14 @@ public class BiomeHolderImpl implements BiomeHolder {
}
@Override
public TerraBiome getBiome(int x, int z) {
public Biome getBiome(int x, int z) {
x += offset;
z += offset;
return getBiomeRaw(x, z);
}
@Override
public TerraBiome getBiomeRaw(int x, int z) {
public Biome getBiomeRaw(int x, int z) {
if(x >= width || z >= width || x < 0 || z < 0) return null;
return biomes[x][z];
}
common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/BiomePipelineProvider.java
+6 -5
View File
@@ -9,6 +9,8 @@ package com.dfsek.terra.addons.biome.pipeline;
import com.dfsek.terra.addons.biome.pipeline.api.Stage;
import com.dfsek.terra.api.world.biome.Biome;
import com.google.common.cache.CacheBuilder;
import com.google.common.cache.CacheLoader;
import com.google.common.cache.LoadingCache;
@@ -18,7 +20,6 @@ import org.jetbrains.annotations.NotNull;
import com.dfsek.terra.addons.biome.pipeline.api.BiomeHolder;
import com.dfsek.terra.api.Platform;
import com.dfsek.terra.api.noise.NoiseSampler;
import com.dfsek.terra.api.world.biome.TerraBiome;
import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
import java.util.HashSet;
@@ -50,7 +51,7 @@ public class BiomePipelineProvider implements BiomeProvider {
}
@Override
public TerraBiome getBiome(int x, int z, long seed) {
public Biome getBiome(int x, int z, long seed) {
x += mutator.noise(seed + 1, x, z) * noiseAmp;
z += mutator.noise(seed + 2, x, z) * noiseAmp;
@@ -66,10 +67,10 @@ public class BiomePipelineProvider implements BiomeProvider {
}
@Override
public Iterable<TerraBiome> getBiomes() {
Set<TerraBiome> biomeSet = new HashSet<>();
public Iterable<Biome> getBiomes() {
Set<Biome> biomeSet = new HashSet<>();
pipeline.getSource().getBiomes().forEach(biomeSet::add);
Iterable<TerraBiome> result = biomeSet;
Iterable<Biome> result = biomeSet;
for(Stage stage : pipeline.getStages()) {
result = stage.getBiomes(result); // pass through all stages
}
common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/BiomeExpander.java
+2 -2
View File
@@ -7,9 +7,9 @@
package com.dfsek.terra.addons.biome.pipeline.api;
import com.dfsek.terra.api.world.biome.TerraBiome;
import com.dfsek.terra.api.world.biome.Biome;
public interface BiomeExpander {
TerraBiome getBetween(double x, double z, long seed, TerraBiome... others);
Biome getBetween(double x, double z, long seed, Biome... others);
}
common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/BiomeHolder.java
+3 -3
View File
@@ -8,7 +8,7 @@
package com.dfsek.terra.addons.biome.pipeline.api;
import com.dfsek.terra.addons.biome.pipeline.source.BiomeSource;
import com.dfsek.terra.api.world.biome.TerraBiome;
import com.dfsek.terra.api.world.biome.Biome;
public interface BiomeHolder {
@@ -18,7 +18,7 @@ public interface BiomeHolder {
void fill(BiomeSource source, long seed);
TerraBiome getBiome(int x, int z);
Biome getBiome(int x, int z);
TerraBiome getBiomeRaw(int x, int z);
Biome getBiomeRaw(int x, int z);
}
common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/BiomeMutator.java
+4 -4
View File
@@ -7,13 +7,13 @@
package com.dfsek.terra.addons.biome.pipeline.api;
import com.dfsek.terra.api.world.biome.TerraBiome;
import com.dfsek.terra.api.world.biome.Biome;
public interface BiomeMutator {
TerraBiome mutate(ViewPoint viewPoint, double x, double z, long seed);
Biome mutate(ViewPoint viewPoint, double x, double z, long seed);
default Iterable<TerraBiome> getBiomes(Iterable<TerraBiome> biomes) {
default Iterable<Biome> getBiomes(Iterable<Biome> biomes) {
return biomes;
}
@@ -29,7 +29,7 @@ public interface BiomeMutator {
}
public TerraBiome getBiome(int x, int z) {
public Biome getBiome(int x, int z) {
return biomes.getBiomeRaw(x + offX, z + offZ);
}
}
common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/Stage.java
+2 -2
View File
@@ -7,7 +7,7 @@
package com.dfsek.terra.addons.biome.pipeline.api;
import com.dfsek.terra.api.world.biome.TerraBiome;
import com.dfsek.terra.api.world.biome.Biome;
public interface Stage {
@@ -15,5 +15,5 @@ public interface Stage {
boolean isExpansion();
Iterable<TerraBiome> getBiomes(Iterable<TerraBiome> biomes);
Iterable<Biome> getBiomes(Iterable<Biome> biomes);
}
common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/NoiseSourceTemplate.java
+2 -2
View File
@@ -14,7 +14,7 @@ import com.dfsek.terra.addons.biome.pipeline.source.NoiseSource;
import com.dfsek.terra.api.config.meta.Meta;
import com.dfsek.terra.api.noise.NoiseSampler;
import com.dfsek.terra.api.util.collection.ProbabilityCollection;
import com.dfsek.terra.api.world.biome.TerraBiome;
import com.dfsek.terra.api.world.biome.Biome;
public class NoiseSourceTemplate extends SourceTemplate {
@@ -22,7 +22,7 @@ public class NoiseSourceTemplate extends SourceTemplate {
private @Meta NoiseSampler noise;
@Value("biomes")
private @Meta ProbabilityCollection<@Meta TerraBiome> biomes;
private @Meta ProbabilityCollection<@Meta Biome> biomes;
@Override
public BiomeSource get() {
common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/mutator/BorderListMutatorTemplate.java
+3 -3
View File
@@ -17,7 +17,7 @@ import com.dfsek.terra.addons.biome.pipeline.mutator.BorderListMutator;
import com.dfsek.terra.addons.biome.pipeline.stages.MutatorStage;
import com.dfsek.terra.api.config.meta.Meta;
import com.dfsek.terra.api.util.collection.ProbabilityCollection;
import com.dfsek.terra.api.world.biome.TerraBiome;
import com.dfsek.terra.api.world.biome.Biome;
@SuppressWarnings("unused")
@@ -29,10 +29,10 @@ public class BorderListMutatorTemplate extends StageTemplate {
private @Meta String defaultReplace;
@Value("default-to")
private @Meta ProbabilityCollection<@Meta TerraBiome> defaultTo;
private @Meta ProbabilityCollection<@Meta Biome> defaultTo;
@Value("replace")
private @Meta Map<@Meta TerraBiome, @Meta ProbabilityCollection<@Meta TerraBiome>> replace;
private @Meta Map<@Meta Biome, @Meta ProbabilityCollection<@Meta Biome>> replace;
@Override
common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/mutator/BorderMutatorTemplate.java
+2 -2
View File
@@ -15,7 +15,7 @@ import com.dfsek.terra.addons.biome.pipeline.mutator.BorderMutator;
import com.dfsek.terra.addons.biome.pipeline.stages.MutatorStage;
import com.dfsek.terra.api.config.meta.Meta;
import com.dfsek.terra.api.util.collection.ProbabilityCollection;
import com.dfsek.terra.api.world.biome.TerraBiome;
import com.dfsek.terra.api.world.biome.Biome;
@SuppressWarnings("unused")
@@ -27,7 +27,7 @@ public class BorderMutatorTemplate extends StageTemplate {
private @Meta String replace;
@Value("to")
private @Meta ProbabilityCollection<@Meta TerraBiome> to;
private @Meta ProbabilityCollection<@Meta Biome> to;
@Override
public Stage get() {
common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/mutator/ReplaceListMutatorTemplate.java
+3 -3
View File
@@ -17,7 +17,7 @@ import com.dfsek.terra.addons.biome.pipeline.mutator.ReplaceListMutator;
import com.dfsek.terra.addons.biome.pipeline.stages.MutatorStage;
import com.dfsek.terra.api.config.meta.Meta;
import com.dfsek.terra.api.util.collection.ProbabilityCollection;
import com.dfsek.terra.api.world.biome.TerraBiome;
import com.dfsek.terra.api.world.biome.Biome;
@SuppressWarnings("unused")
@@ -26,10 +26,10 @@ public class ReplaceListMutatorTemplate extends StageTemplate {
private @Meta String defaultFrom;
@Value("default-to")
private @Meta ProbabilityCollection<@Meta TerraBiome> defaultTo;
private @Meta ProbabilityCollection<@Meta Biome> defaultTo;
@Value("to")
private @Meta Map<@Meta TerraBiome, @Meta ProbabilityCollection<@Meta TerraBiome>> replace;
private @Meta Map<@Meta Biome, @Meta ProbabilityCollection<@Meta Biome>> replace;
@Override
public Stage get() {
common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/mutator/ReplaceMutatorTemplate.java
+2 -2
View File
@@ -15,7 +15,7 @@ import com.dfsek.terra.addons.biome.pipeline.mutator.ReplaceMutator;
import com.dfsek.terra.addons.biome.pipeline.stages.MutatorStage;
import com.dfsek.terra.api.config.meta.Meta;
import com.dfsek.terra.api.util.collection.ProbabilityCollection;
import com.dfsek.terra.api.world.biome.TerraBiome;
import com.dfsek.terra.api.world.biome.Biome;
@SuppressWarnings("unused")
@@ -24,7 +24,7 @@ public class ReplaceMutatorTemplate extends StageTemplate {
private @Meta String from;
@Value("to")
private @Meta ProbabilityCollection<@Meta TerraBiome> to;
private @Meta ProbabilityCollection<@Meta Biome> to;
@Override
public Stage get() {
common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/expand/FractalExpander.java
+2 -2
View File
@@ -10,7 +10,7 @@ package com.dfsek.terra.addons.biome.pipeline.expand;
import com.dfsek.terra.addons.biome.pipeline.api.BiomeExpander;
import com.dfsek.terra.api.noise.NoiseSampler;
import com.dfsek.terra.api.util.MathUtil;
import com.dfsek.terra.api.world.biome.TerraBiome;
import com.dfsek.terra.api.world.biome.Biome;
public class FractalExpander implements BiomeExpander {
@@ -21,7 +21,7 @@ public class FractalExpander implements BiomeExpander {
}
@Override
public TerraBiome getBetween(double x, double z, long seed, TerraBiome... others) {
public Biome getBetween(double x, double z, long seed, Biome... others) {
return others[MathUtil.normalizeIndex(sampler.noise(seed, x, z), others.length)];
}
}
common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/mutator/BorderListMutator.java
+12 -12
View File
@@ -15,18 +15,18 @@ import java.util.Set;
import com.dfsek.terra.addons.biome.pipeline.api.BiomeMutator;
import com.dfsek.terra.api.noise.NoiseSampler;
import com.dfsek.terra.api.util.collection.ProbabilityCollection;
import com.dfsek.terra.api.world.biome.TerraBiome;
import com.dfsek.terra.api.world.biome.Biome;
public class BorderListMutator implements BiomeMutator {
private final String border;
private final NoiseSampler noiseSampler;
private final ProbabilityCollection<TerraBiome> replaceDefault;
private final ProbabilityCollection<Biome> replaceDefault;
private final String defaultReplace;
private final Map<TerraBiome, ProbabilityCollection<TerraBiome>> replace;
private final Map<Biome, ProbabilityCollection<Biome>> replace;
public BorderListMutator(Map<TerraBiome, ProbabilityCollection<TerraBiome>> replace, String border, String defaultReplace,
NoiseSampler noiseSampler, ProbabilityCollection<TerraBiome> replaceDefault) {
public BorderListMutator(Map<Biome, ProbabilityCollection<Biome>> replace, String border, String defaultReplace,
NoiseSampler noiseSampler, ProbabilityCollection<Biome> replaceDefault) {
this.border = border;
this.noiseSampler = noiseSampler;
this.replaceDefault = replaceDefault;
@@ -35,20 +35,20 @@ public class BorderListMutator implements BiomeMutator {
}
@Override
public TerraBiome mutate(ViewPoint viewPoint, double x, double z, long seed) {
TerraBiome origin = viewPoint.getBiome(0, 0);
public Biome mutate(ViewPoint viewPoint, double x, double z, long seed) {
Biome origin = viewPoint.getBiome(0, 0);
if(origin.getTags().contains(defaultReplace)) {
for(int xi = -1; xi <= 1; xi++) {
for(int zi = -1; zi <= 1; zi++) {
if(xi == 0 && zi == 0) continue;
TerraBiome current = viewPoint.getBiome(xi, zi);
Biome current = viewPoint.getBiome(xi, zi);
if(current == null) continue;
if(current.getTags().contains(border)) {
if(replace.containsKey(origin)) {
TerraBiome biome = replace.get(origin).get(noiseSampler, x, z, seed);
Biome biome = replace.get(origin).get(noiseSampler, x, z, seed);
return biome == null ? origin : biome;
}
TerraBiome biome = replaceDefault.get(noiseSampler, x, z, seed);
Biome biome = replaceDefault.get(noiseSampler, x, z, seed);
return biome == null ? origin : biome;
}
}
@@ -58,8 +58,8 @@ public class BorderListMutator implements BiomeMutator {
}
@Override
public Iterable<TerraBiome> getBiomes(Iterable<TerraBiome> biomes) {
Set<TerraBiome> biomeSet = new HashSet<>();
public Iterable<Biome> getBiomes(Iterable<Biome> biomes) {
Set<Biome> biomeSet = new HashSet<>();
biomes.forEach(biomeSet::add);
biomeSet.addAll(replaceDefault.getContents().stream().filter(Objects::nonNull).toList());
replace.forEach((biome, collection) -> biomeSet.addAll(collection.getContents()));
common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/mutator/BorderMutator.java
+9 -9
View File
@@ -10,7 +10,7 @@ package com.dfsek.terra.addons.biome.pipeline.mutator;
import com.dfsek.terra.addons.biome.pipeline.api.BiomeMutator;
import com.dfsek.terra.api.noise.NoiseSampler;
import com.dfsek.terra.api.util.collection.ProbabilityCollection;
import com.dfsek.terra.api.world.biome.TerraBiome;
import com.dfsek.terra.api.world.biome.Biome;
import java.util.HashSet;
import java.util.Objects;
@@ -20,10 +20,10 @@ import java.util.Set;
public class BorderMutator implements BiomeMutator {
private final String border;
private final NoiseSampler noiseSampler;
private final ProbabilityCollection<TerraBiome> replace;
private final ProbabilityCollection<Biome> replace;
private final String replaceTag;
public BorderMutator(String border, String replaceTag, NoiseSampler noiseSampler, ProbabilityCollection<TerraBiome> replace) {
public BorderMutator(String border, String replaceTag, NoiseSampler noiseSampler, ProbabilityCollection<Biome> replace) {
this.border = border;
this.noiseSampler = noiseSampler;
this.replace = replace;
@@ -31,16 +31,16 @@ public class BorderMutator implements BiomeMutator {
}
@Override
public TerraBiome mutate(ViewPoint viewPoint, double x, double z, long seed) {
TerraBiome origin = viewPoint.getBiome(0, 0);
public Biome mutate(ViewPoint viewPoint, double x, double z, long seed) {
Biome origin = viewPoint.getBiome(0, 0);
if(origin.getTags().contains(replaceTag)) {
for(int xi = -1; xi <= 1; xi++) {
for(int zi = -1; zi <= 1; zi++) {
if(xi == 0 && zi == 0) continue;
TerraBiome current = viewPoint.getBiome(xi, zi);
Biome current = viewPoint.getBiome(xi, zi);
if(current == null) continue;
if(current.getTags().contains(border)) {
TerraBiome biome = replace.get(noiseSampler, x, z, seed);
Biome biome = replace.get(noiseSampler, x, z, seed);
return biome == null ? origin : biome;
}
}
@@ -50,8 +50,8 @@ public class BorderMutator implements BiomeMutator {
}
@Override
public Iterable<TerraBiome> getBiomes(Iterable<TerraBiome> biomes) {
Set<TerraBiome> biomeSet = new HashSet<>();
public Iterable<Biome> getBiomes(Iterable<Biome> biomes) {
Set<Biome> biomeSet = new HashSet<>();
biomes.forEach(biomeSet::add);
biomeSet.addAll(replace.getContents().stream().filter(Objects::nonNull).toList());
return biomeSet;
common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/mutator/ReplaceListMutator.java
+12 -12
View File
@@ -15,17 +15,17 @@ import java.util.stream.Stream;
import com.dfsek.terra.addons.biome.pipeline.api.BiomeMutator;
import com.dfsek.terra.api.noise.NoiseSampler;
import com.dfsek.terra.api.util.collection.ProbabilityCollection;
import com.dfsek.terra.api.world.biome.TerraBiome;
import com.dfsek.terra.api.world.biome.Biome;
public class ReplaceListMutator implements BiomeMutator {
private final Map<TerraBiome, ProbabilityCollection<TerraBiome>> replace;
private final Map<Biome, ProbabilityCollection<Biome>> replace;
private final NoiseSampler sampler;
private final ProbabilityCollection<TerraBiome> replaceDefault;
private final ProbabilityCollection<Biome> replaceDefault;
private final String defaultTag;
public ReplaceListMutator(Map<TerraBiome, ProbabilityCollection<TerraBiome>> replace, String defaultTag,
ProbabilityCollection<TerraBiome> replaceDefault, NoiseSampler sampler) {
public ReplaceListMutator(Map<Biome, ProbabilityCollection<Biome>> replace, String defaultTag,
ProbabilityCollection<Biome> replaceDefault, NoiseSampler sampler) {
this.replace = replace;
this.sampler = sampler;
this.defaultTag = defaultTag;
@@ -33,24 +33,24 @@ public class ReplaceListMutator implements BiomeMutator {
}
@Override
public TerraBiome mutate(ViewPoint viewPoint, double x, double z, long seed) {
TerraBiome center = viewPoint.getBiome(0, 0);
public Biome mutate(ViewPoint viewPoint, double x, double z, long seed) {
Biome center = viewPoint.getBiome(0, 0);
if(replace.containsKey(center)) {
TerraBiome biome = replace.get(center).get(sampler, x, z, seed);
Biome biome = replace.get(center).get(sampler, x, z, seed);
return biome == null ? viewPoint.getBiome(0, 0) : biome;
}
if(viewPoint.getBiome(0, 0).getTags().contains(defaultTag)) {
TerraBiome biome = replaceDefault.get(sampler, x, z, seed);
Biome biome = replaceDefault.get(sampler, x, z, seed);
return biome == null ? viewPoint.getBiome(0, 0) : biome;
}
return center;
}
@Override
public Iterable<TerraBiome> getBiomes(Iterable<TerraBiome> biomes) {
Set<TerraBiome> biomeSet = new HashSet<>();
public Iterable<Biome> getBiomes(Iterable<Biome> biomes) {
Set<Biome> biomeSet = new HashSet<>();
Set<TerraBiome> reject = new HashSet<>();
Set<Biome> reject = new HashSet<>();
biomes.forEach(biome -> {
if(!biome.getTags().contains(defaultTag) && !replace.containsKey(biome)) {
common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/mutator/ReplaceMutator.java
+8 -8
View File
@@ -10,7 +10,7 @@ package com.dfsek.terra.addons.biome.pipeline.mutator;
import com.dfsek.terra.addons.biome.pipeline.api.BiomeMutator;
import com.dfsek.terra.api.noise.NoiseSampler;
import com.dfsek.terra.api.util.collection.ProbabilityCollection;
import com.dfsek.terra.api.world.biome.TerraBiome;
import com.dfsek.terra.api.world.biome.Biome;
import java.util.HashSet;
import java.util.Set;
@@ -19,28 +19,28 @@ import java.util.stream.Stream;
public class ReplaceMutator implements BiomeMutator {
private final String replaceableTag;
private final ProbabilityCollection<TerraBiome> replace;
private final ProbabilityCollection<Biome> replace;
private final NoiseSampler sampler;
public ReplaceMutator(String replaceable, ProbabilityCollection<TerraBiome> replace, NoiseSampler sampler) {
public ReplaceMutator(String replaceable, ProbabilityCollection<Biome> replace, NoiseSampler sampler) {
this.replaceableTag = replaceable;
this.replace = replace;
this.sampler = sampler;
}
@Override
public TerraBiome mutate(ViewPoint viewPoint, double x, double z, long seed) {
public Biome mutate(ViewPoint viewPoint, double x, double z, long seed) {
if(viewPoint.getBiome(0, 0).getTags().contains(replaceableTag)) {
TerraBiome biome = replace.get(sampler, x, z, seed);
Biome biome = replace.get(sampler, x, z, seed);
return biome == null ? viewPoint.getBiome(0, 0) : biome;
}
return viewPoint.getBiome(0, 0);
}
@Override
public Iterable<TerraBiome> getBiomes(Iterable<TerraBiome> biomes) {
Set<TerraBiome> biomeSet = new HashSet<>();
Set<TerraBiome> reject = new HashSet<>();
public Iterable<Biome> getBiomes(Iterable<Biome> biomes) {
Set<Biome> biomeSet = new HashSet<>();
Set<Biome> reject = new HashSet<>();
biomes.forEach(biome -> {
if(!biome.getTags().contains(replaceableTag)) {
biomeSet.add(biome);
common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/mutator/SmoothMutator.java
+6 -6
View File
@@ -12,7 +12,7 @@ import java.util.Objects;
import com.dfsek.terra.addons.biome.pipeline.api.BiomeMutator;
import com.dfsek.terra.api.noise.NoiseSampler;
import com.dfsek.terra.api.util.MathUtil;
import com.dfsek.terra.api.world.biome.TerraBiome;
import com.dfsek.terra.api.world.biome.Biome;
public class SmoothMutator implements BiomeMutator {
@@ -24,11 +24,11 @@ public class SmoothMutator implements BiomeMutator {
}
@Override
public TerraBiome mutate(ViewPoint viewPoint, double x, double z, long seed) {
TerraBiome top = viewPoint.getBiome(1, 0);
TerraBiome bottom = viewPoint.getBiome(-1, 0);
TerraBiome left = viewPoint.getBiome(0, 1);
TerraBiome right = viewPoint.getBiome(0, -1);
public Biome mutate(ViewPoint viewPoint, double x, double z, long seed) {
Biome top = viewPoint.getBiome(1, 0);
Biome bottom = viewPoint.getBiome(-1, 0);
Biome left = viewPoint.getBiome(0, 1);
Biome right = viewPoint.getBiome(0, -1);
boolean vert = Objects.equals(top, bottom) && top != null;
common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/source/BiomeSource.java
+3 -3
View File
@@ -7,11 +7,11 @@
package com.dfsek.terra.addons.biome.pipeline.source;
import com.dfsek.terra.api.world.biome.TerraBiome;
import com.dfsek.terra.api.world.biome.Biome;
public interface BiomeSource {
TerraBiome getBiome(double x, double z, long seed);
Biome getBiome(double x, double z, long seed);
Iterable<TerraBiome> getBiomes();
Iterable<Biome> getBiomes();
}
common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/source/NoiseSource.java
+5 -5
View File
@@ -9,25 +9,25 @@ package com.dfsek.terra.addons.biome.pipeline.source;
import com.dfsek.terra.api.noise.NoiseSampler;
import com.dfsek.terra.api.util.collection.ProbabilityCollection;
import com.dfsek.terra.api.world.biome.TerraBiome;
import com.dfsek.terra.api.world.biome.Biome;
public class NoiseSource implements BiomeSource {
private final ProbabilityCollection<TerraBiome> biomes;
private final ProbabilityCollection<Biome> biomes;
private final NoiseSampler sampler;
public NoiseSource(ProbabilityCollection<TerraBiome> biomes, NoiseSampler sampler) {
public NoiseSource(ProbabilityCollection<Biome> biomes, NoiseSampler sampler) {
this.biomes = biomes;
this.sampler = sampler;
}
@Override
public TerraBiome getBiome(double x, double z, long seed) {
public Biome getBiome(double x, double z, long seed) {
return biomes.get(sampler, x, z, seed);
}
@Override
public Iterable<TerraBiome> getBiomes() {
public Iterable<Biome> getBiomes() {
return biomes.getContents();
}
}
common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/stages/ExpanderStage.java
+2 -4
View File
@@ -10,9 +10,7 @@ package com.dfsek.terra.addons.biome.pipeline.stages;
import com.dfsek.terra.addons.biome.pipeline.api.BiomeExpander;
import com.dfsek.terra.addons.biome.pipeline.api.BiomeHolder;
import com.dfsek.terra.addons.biome.pipeline.api.Stage;
import com.dfsek.terra.api.world.biome.TerraBiome;
import java.util.Collections;
import com.dfsek.terra.api.world.biome.Biome;
public class ExpanderStage implements Stage {
@@ -33,7 +31,7 @@ public class ExpanderStage implements Stage {
}
@Override
public Iterable<TerraBiome> getBiomes(Iterable<TerraBiome> biomes) {
public Iterable<Biome> getBiomes(Iterable<Biome> biomes) {
return biomes;
}
}
common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/stages/MutatorStage.java
+2 -2
View File
@@ -10,7 +10,7 @@ package com.dfsek.terra.addons.biome.pipeline.stages;
import com.dfsek.terra.addons.biome.pipeline.api.BiomeHolder;
import com.dfsek.terra.addons.biome.pipeline.api.BiomeMutator;
import com.dfsek.terra.addons.biome.pipeline.api.Stage;
import com.dfsek.terra.api.world.biome.TerraBiome;
import com.dfsek.terra.api.world.biome.Biome;
public class MutatorStage implements Stage {
@@ -32,7 +32,7 @@ public class MutatorStage implements Stage {
}
@Override
public Iterable<TerraBiome> getBiomes(Iterable<TerraBiome> biomes) {
public Iterable<Biome> getBiomes(Iterable<Biome> biomes) {
return mutator.getBiomes(biomes);
}