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

NoiseSeeded -> SeededNoiseSampler

Browse Source
This commit is contained in:
dfsek
2021-07-17 21:36:27 -07:00
parent 1194cca485
commit 84e7d11156
23 changed files with 65 additions and 67 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/PaletteTemplate.java
+3 -3
View File
@@ -5,7 +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.util.seeded.NoiseSeeded;
import com.dfsek.terra.api.util.seeded.SeededNoiseSampler;
import java.util.List;
@@ -13,7 +13,7 @@ import java.util.List;
public class PaletteTemplate implements AbstractableTemplate {
@Value("noise")
@Default
private NoiseSeeded noise = NoiseSeeded.zero(2);
private SeededNoiseSampler noise = SeededNoiseSampler.zero(2);
@Value("id")
@Final
@@ -30,7 +30,7 @@ public class PaletteTemplate implements AbstractableTemplate {
return palette;
}
public NoiseSeeded getNoise() {
public SeededNoiseSampler getNoise() {
return noise;
}
}
common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/palette/PaletteLayerLoader.java
+2 -3
View File
@@ -6,10 +6,9 @@ import com.dfsek.tectonic.loading.TypeLoader;
import com.dfsek.terra.api.block.state.BlockState;
import com.dfsek.terra.api.noise.NoiseSampler;
import com.dfsek.terra.api.util.collection.ProbabilityCollection;
import com.dfsek.terra.api.util.seeded.NoiseSeeded;
import com.dfsek.terra.api.util.seeded.SeededNoiseSampler;
import java.lang.reflect.AnnotatedType;
import java.lang.reflect.Type;
import java.util.Map;
@SuppressWarnings("unchecked")
@@ -34,7 +33,7 @@ public class PaletteLayerLoader implements TypeLoader<PaletteLayerHolder> {
NoiseSampler sampler = null;
if(map.containsKey("noise")) {
sampler = configLoader.loadType(NoiseSeeded.class, map.get("noise")).apply(2403L);
sampler = configLoader.loadType(SeededNoiseSampler.class, map.get("noise")).apply(2403L);
}
if(collection == null) throw new LoadException("Collection is null: " + map.get("materials"));