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 SeededNoiseSampler from configs

Browse Source
This commit is contained in:
dfsek
2021-07-19 21:10:49 -07:00
parent 3bf8fe7901
commit 6f40e7b1f5
35 changed files with 92 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/PaletteFactory.java
+1 -1
View File
@@ -9,7 +9,7 @@ import com.dfsek.terra.api.world.generator.Palette;
public class PaletteFactory implements ConfigFactory<PaletteTemplate, Palette> {
@Override
public Palette build(PaletteTemplate config, TerraPlugin main) {
NoisePalette palette = new NoisePalette(config.getNoise().build(2403L), config.getNoise().getDimensions() == 2);
NoisePalette palette = new NoisePalette(config.getNoise());
for(PaletteLayerHolder layer : config.getPalette()) {
palette.add(layer.getLayer(), layer.getSize(), layer.getSampler());
}
common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/PaletteTemplate.java
+3 -2
View File
@@ -5,6 +5,7 @@ import com.dfsek.tectonic.annotations.Final;
import com.dfsek.tectonic.annotations.Value;
import com.dfsek.terra.addons.palette.palette.PaletteLayerHolder;
import com.dfsek.terra.api.config.AbstractableTemplate;
import com.dfsek.terra.api.noise.NoiseSampler;
import com.dfsek.terra.api.util.seeded.SeededNoiseSampler;
import java.util.List;
@@ -13,7 +14,7 @@ import java.util.List;
public class PaletteTemplate implements AbstractableTemplate {
@Value("noise")
@Default
private SeededNoiseSampler noise = SeededNoiseSampler.zero(2);
private NoiseSampler noise = NoiseSampler.zero();
@Value("id")
@Final
@@ -30,7 +31,7 @@ public class PaletteTemplate implements AbstractableTemplate {
return palette;
}
public SeededNoiseSampler getNoise() {
public NoiseSampler getNoise() {
return noise;
}
}
common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/palette/NoisePalette.java
+3 -5
View File
@@ -7,12 +7,10 @@ import java.util.List;
public class NoisePalette extends PaletteImpl {
private final NoiseSampler sampler;
private final boolean is2D;
public NoisePalette(NoiseSampler sampler, boolean is2D) {
public NoisePalette(NoiseSampler sampler) {
this.sampler = sampler;
this.is2D = is2D;
}
}
@Override
public BlockState get(int layer, double x, double y, double z, long seed) {
@@ -24,6 +22,6 @@ public class NoisePalette extends PaletteImpl {
else paletteLayer = pl.get(layer);
}
NoiseSampler paletteSampler = paletteLayer.getSampler();
return paletteLayer.get(paletteSampler == null ? sampler : paletteSampler, x, y, z, is2D, seed);
return paletteLayer.get(paletteSampler == null ? sampler : paletteSampler, x, y, z, seed);
}
}
common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/palette/PaletteImpl.java
+2 -12
View File
@@ -86,19 +86,9 @@ public abstract class PaletteImpl implements Palette {
return sampler;
}
/**
* Gets a material from the layer.
*
* @return Material - the material..
*/
public BlockState get(Random random) {
if(col) return this.collection.get(random);
return m;
}
public BlockState get(NoiseSampler random, double x, double y, double z, boolean is2D, long seed) {
if(col && is2D) return this.collection.get(random, x, z, seed);
else if(col) return this.collection.get(random, x, y, z, seed);
public BlockState get(NoiseSampler random, double x, double y, double z, long seed) {
if(col) return this.collection.get(random, x, y, z, seed);
return m;
}