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

WIP Seismic Integration

Browse Source
This commit is contained in:
Zoë Gidiere
2025-03-01 21:32:39 -07:00
parent 8366a5288b
commit 5892464a1d
239 changed files with 623 additions and 6195 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
@@ -16,14 +16,14 @@ import java.util.List;
import com.dfsek.terra.addons.palette.palette.PaletteLayerHolder;
import com.dfsek.terra.api.config.AbstractableTemplate;
import com.dfsek.terra.api.config.meta.Meta;
import com.dfsek.terra.api.noise.NoiseSampler;
import com.dfsek.seismic.type.sampler.Sampler;
@SuppressWarnings({ "FieldMayBeFinal", "unused" })
public class PaletteTemplate implements AbstractableTemplate {
@Value("sampler")
@Default
private @Meta NoiseSampler defaultSampler = NoiseSampler.zero();
private @Meta Sampler defaultSampler = Sampler.zero();
@Value("id")
@Final
@@ -40,7 +40,7 @@ public class PaletteTemplate implements AbstractableTemplate {
return palette;
}
public NoiseSampler getDefaultSampler() {
public Sampler getDefaultSampler() {
return defaultSampler;
}
}
common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/palette/PaletteImpl.java
+5 -5
View File
@@ -11,7 +11,7 @@ import java.util.ArrayList;
import java.util.List;
import com.dfsek.terra.api.block.state.BlockState;
import com.dfsek.terra.api.noise.NoiseSampler;
import com.dfsek.seismic.type.sampler.Sampler;
import com.dfsek.terra.api.util.collection.ProbabilityCollection;
import com.dfsek.terra.api.world.chunk.generation.util.Palette;
@@ -22,13 +22,13 @@ import com.dfsek.terra.api.world.chunk.generation.util.Palette;
public class PaletteImpl implements Palette {
private final PaletteLayer[] layers;
public PaletteImpl(List<PaletteLayerHolder> layers, NoiseSampler defaultSampler) {
public PaletteImpl(List<PaletteLayerHolder> layers, Sampler defaultSampler) {
List<PaletteLayer> layerArray = new ArrayList<>();
for (PaletteLayerHolder holder : layers) {
PaletteLayer layer;
ProbabilityCollection<BlockState> materials = holder.getLayer();
NoiseSampler sampler = holder.getSampler() == null ? defaultSampler : holder.getSampler();
Sampler sampler = holder.getSampler() == null ? defaultSampler : holder.getSampler();
layer = new PaletteLayer(materials, sampler);
for (int i = 0; i < holder.getSize(); i++)
layerArray.add(layer);
@@ -44,10 +44,10 @@ public class PaletteImpl implements Palette {
}
static class PaletteLayer {
private final NoiseSampler sampler;
private final Sampler sampler;
private final ProbabilityCollection<BlockState> collection;
public PaletteLayer(ProbabilityCollection<BlockState> type, NoiseSampler sampler) {
public PaletteLayer(ProbabilityCollection<BlockState> type, Sampler sampler) {
this.sampler = sampler;
this.collection = type;
}
common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/palette/PaletteLayerHolder.java
+4 -4
View File
@@ -10,16 +10,16 @@ package com.dfsek.terra.addons.palette.palette;
import org.jetbrains.annotations.NotNull;
import com.dfsek.terra.api.block.state.BlockState;
import com.dfsek.terra.api.noise.NoiseSampler;
import com.dfsek.seismic.type.sampler.Sampler;
import com.dfsek.terra.api.util.collection.ProbabilityCollection;
public class PaletteLayerHolder {
private final ProbabilityCollection<BlockState> layer;
private final NoiseSampler sampler;
private final Sampler sampler;
private final int size;
public PaletteLayerHolder(@NotNull ProbabilityCollection<BlockState> layer, NoiseSampler sampler, int size) {
public PaletteLayerHolder(@NotNull ProbabilityCollection<BlockState> layer, Sampler sampler, int size) {
this.layer = layer;
this.sampler = sampler;
this.size = size;
@@ -34,7 +34,7 @@ public class PaletteLayerHolder {
return size;
}
public NoiseSampler getSampler() {
public Sampler getSampler() {
return sampler;
}
}
common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/palette/PaletteLayerLoader.java
+2 -2
View File
@@ -13,7 +13,7 @@ import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
import com.dfsek.terra.api.block.state.BlockState;
import com.dfsek.terra.api.config.meta.Meta;
import com.dfsek.terra.api.noise.NoiseSampler;
import com.dfsek.seismic.type.sampler.Sampler;
import com.dfsek.terra.api.util.collection.ProbabilityCollection;
@@ -23,7 +23,7 @@ public class PaletteLayerLoader implements ObjectTemplate<PaletteLayerHolder> {
@Value("sampler")
@Default
private @Meta NoiseSampler sampler = null;
private @Meta Sampler sampler = null;
@Value("layers")
private @Meta int layers;