mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2025-07-01 15:37:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix build

Browse Source
This commit is contained in:
Zoë Gidiere 2025-06-05 22:40:11 -06:00
parent e079cdfcc0
commit f04c9b3e73
23 changed files with 41 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/addons/chunk-generator-layered/build.gradle.kts
View File

@ -3,9 +3,6 @@ version = version("0.1.0")
dependencies {
compileOnlyApi(project(":common:addons:manifest-addon-loader"))
api("com.dfsek", "paralithic", Versions.Libraries.paralithic)
implementation("net.jafama", "jafama", Versions.Libraries.Internal.jafama)
testImplementation("net.jafama", "jafama", Versions.Libraries.Internal.jafama)
}
tasks.named<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar>("shadowJar") {

2
common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/config/palette/DotProductLayerPaletteTemplate.java
View File

@ -13,7 +13,7 @@ import com.dfsek.terra.addons.chunkgenerator.math.pointset.generative.AdjacentPo
import com.dfsek.terra.addons.chunkgenerator.palette.DoubleNavigableHolder;
import com.dfsek.terra.addons.chunkgenerator.util.InstanceWrapper;
import com.dfsek.terra.addons.chunkgenerator.math.pointset.PointSet;
import com.dfsek.terra.api.util.vector.Vector3;
import com.dfsek.seismic.type.vector.Vector3;
import com.dfsek.terra.api.world.chunk.generation.util.Palette;

2
common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/config/pointset/generative/SimplePointSetTemplate.java
View File

@ -7,7 +7,7 @@ import java.util.Set;
import com.dfsek.terra.addons.chunkgenerator.math.pointset.PointSet;
import com.dfsek.terra.addons.chunkgenerator.math.pointset.generative.SimplePointSet;
import com.dfsek.terra.api.util.vector.Vector3Int;
import com.dfsek.seismic.type.vector.Vector3Int;
public class SimplePointSetTemplate implements ObjectTemplate<PointSet> {

2
common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/config/predicate/RangeLayerPredicateTemplate.java
View File

@ -5,7 +5,7 @@ import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
import com.dfsek.terra.addons.chunkgenerator.api.LayerPredicate;
import com.dfsek.terra.addons.chunkgenerator.layer.predicate.RangeLayerPredicate;
import com.dfsek.terra.api.util.Range;
import com.dfsek.terra.api.util.range.Range;
public class RangeLayerPredicateTemplate implements ObjectTemplate<LayerPredicate> {

4
common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/config/sampler/BiomeDefinedLayerSamplerTemplate.java
View File

@ -7,14 +7,14 @@ import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
import com.dfsek.terra.addons.chunkgenerator.api.LayerSampler;
import com.dfsek.terra.addons.chunkgenerator.layer.sampler.BiomeDefinedLayerSampler;
import com.dfsek.terra.api.config.meta.Meta;
import com.dfsek.terra.api.noise.NoiseSampler;
import com.dfsek.seismic.type.sampler.Sampler;
public class BiomeDefinedLayerSamplerTemplate implements ObjectTemplate<LayerSampler> {
@Value("default")
@Default
private @Meta NoiseSampler defaultSampler = null;
private @Meta Sampler defaultSampler = null;
@Override
public LayerSampler get() {

4
common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/config/sampler/SimpleLayerSamplerTemplate.java
View File

@ -6,13 +6,13 @@ import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
import com.dfsek.terra.addons.chunkgenerator.api.LayerSampler;
import com.dfsek.terra.addons.chunkgenerator.layer.sampler.SimpleLayerSampler;
import com.dfsek.terra.api.config.meta.Meta;
import com.dfsek.terra.api.noise.NoiseSampler;
import com.dfsek.seismic.type.sampler.Sampler;
public class SimpleLayerSamplerTemplate implements ObjectTemplate<LayerSampler> {
@Value("sampler")
private @Meta NoiseSampler sampler;
private @Meta Sampler sampler;
@Override
public LayerSampler get() {

6
common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/layer/palette/DotProductLayerPalette.java
View File

@ -7,8 +7,8 @@ import com.dfsek.terra.addons.chunkgenerator.api.LayerPalette;
import com.dfsek.terra.addons.chunkgenerator.api.LayerSampler;
import com.dfsek.terra.addons.chunkgenerator.math.pointset.PointSet;
import com.dfsek.terra.addons.chunkgenerator.palette.DoubleNavigableHolder;
import com.dfsek.terra.api.util.vector.Vector3;
import com.dfsek.terra.api.util.vector.Vector3Int;
import com.dfsek.seismic.type.vector.Vector3;
import com.dfsek.seismic.type.vector.Vector3Int;
import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
import com.dfsek.terra.api.world.chunk.generation.util.Palette;
import com.dfsek.terra.api.world.info.WorldProperties;
@ -36,7 +36,7 @@ public class DotProductLayerPalette extends LayerPalette {
Vector3.Mutable surfaceNormalApproximation = Vector3.Mutable.of(0, 0, 0);
for(Vector3Int point : samplePoints) {
double scalar = -sampler.sample(x+point.getX(), y+point.getY(), z+point.getZ(), world, biomeProvider);
surfaceNormalApproximation.add(point.toVector3Mutable().multiply(scalar));
surfaceNormalApproximation.add(point.toFloat().mutable().mulScalar(scalar));
}
return palettes.get(direction.dot(surfaceNormalApproximation.normalize()));
}

2
common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/layer/predicate/RangeLayerPredicate.java
View File

@ -1,7 +1,7 @@
package com.dfsek.terra.addons.chunkgenerator.layer.predicate;
import com.dfsek.terra.addons.chunkgenerator.api.LayerPredicate;
import com.dfsek.terra.api.util.Range;
import com.dfsek.terra.api.util.range.Range;
import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
import com.dfsek.terra.api.world.info.WorldProperties;

2
common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/layer/predicate/SamplerListLayerPredicate.java
View File

@ -4,7 +4,7 @@ import com.dfsek.terra.addons.chunkgenerator.api.LayerPredicate;
import com.dfsek.terra.addons.chunkgenerator.api.LayerSampler;
import com.dfsek.terra.addons.chunkgenerator.math.RelationalOperator;
import com.dfsek.terra.addons.chunkgenerator.math.pointset.PointSet;
import com.dfsek.terra.api.util.vector.Vector3Int;
import com.dfsek.seismic.type.vector.Vector3Int;
import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
import com.dfsek.terra.api.world.info.WorldProperties;

20
common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/layer/sampler/BiomeDefinedLayerSampler.java
View File

@ -3,7 +3,7 @@ package com.dfsek.terra.addons.chunkgenerator.layer.sampler;
import com.dfsek.tectonic.api.config.template.dynamic.DynamicTemplate;
import com.dfsek.tectonic.api.config.template.dynamic.DynamicValue;
import javax.annotation.Nullable;
import org.jetbrains.annotations.Nullable;
import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
@ -14,7 +14,7 @@ import java.util.stream.Collectors;
import com.dfsek.terra.addons.chunkgenerator.LayeredChunkGeneratorAddon;
import com.dfsek.terra.addons.chunkgenerator.api.LayerSampler;
import com.dfsek.terra.api.event.events.config.ConfigurationLoadEvent;
import com.dfsek.terra.api.noise.NoiseSampler;
import com.dfsek.seismic.type.sampler.Sampler;
import com.dfsek.terra.api.properties.Properties;
import com.dfsek.terra.api.world.biome.Biome;
import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
@ -23,9 +23,9 @@ import com.dfsek.terra.api.world.info.WorldProperties;
public class BiomeDefinedLayerSampler implements LayerSampler {
private final NoiseSampler defaultSampler;
private final Sampler defaultSampler;
public BiomeDefinedLayerSampler(@Nullable NoiseSampler defaultSampler) {
public BiomeDefinedLayerSampler(@Nullable Sampler defaultSampler) {
this.defaultSampler = defaultSampler;
}
@ -36,10 +36,10 @@ public class BiomeDefinedLayerSampler implements LayerSampler {
.get(BiomeLayerSamplers.class)
.samplers()
.get(this)
.noise(world.getSeed(), x, y, z);
.getSample(world.getSeed(), x, y, z);
}
private Optional<NoiseSampler> getDefaultSampler() {
private Optional<Sampler> getDefaultSampler() {
return Optional.ofNullable(defaultSampler);
}
@ -56,7 +56,7 @@ public class BiomeDefinedLayerSampler implements LayerSampler {
String id = registryKey.getID();
String fieldName = id + "LayerSampler";
samplerFields.put(biomeLayerSampler, fieldName);
DynamicValue.Builder<NoiseSampler> value = DynamicValue.builder("generation.samplers." + id, NoiseSampler.class);
DynamicValue.Builder<Sampler> value = DynamicValue.builder("generation.samplers." + id, Sampler.class);
biomeLayerSampler.getDefaultSampler().ifPresent(value::setDefault);
templateBuilder.value(fieldName, value.build());
}
@ -64,12 +64,12 @@ public class BiomeDefinedLayerSampler implements LayerSampler {
DynamicTemplate layerSamplerBiomeTemplate = event.load(templateBuilder.build());
Map<BiomeDefinedLayerSampler, NoiseSampler> samplerMap = samplerFields.entrySet().stream().collect(
Collectors.toMap(Entry::getKey, entry -> layerSamplerBiomeTemplate.get(entry.getValue(), NoiseSampler.class)));
Map<BiomeDefinedLayerSampler, Sampler> samplerMap = samplerFields.entrySet().stream().collect(
Collectors.toMap(Entry::getKey, entry -> layerSamplerBiomeTemplate.get(entry.getValue(), Sampler.class)));
event.getLoadedObject(Biome.class).getContext().put(new BiomeLayerSamplers(samplerMap));
}
};
public record BiomeLayerSamplers(Map<BiomeDefinedLayerSampler, NoiseSampler> samplers) implements Properties {
public record BiomeLayerSamplers(Map<BiomeDefinedLayerSampler, Sampler> samplers) implements Properties {
}
}

8
common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/layer/sampler/SimpleLayerSampler.java
View File

@ -1,21 +1,21 @@
package com.dfsek.terra.addons.chunkgenerator.layer.sampler;
import com.dfsek.terra.addons.chunkgenerator.api.LayerSampler;
import com.dfsek.terra.api.noise.NoiseSampler;
import com.dfsek.seismic.type.sampler.Sampler;
import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
import com.dfsek.terra.api.world.info.WorldProperties;
public class SimpleLayerSampler implements LayerSampler {
private NoiseSampler sampler;
private Sampler sampler;
public SimpleLayerSampler(NoiseSampler sampler) {
public SimpleLayerSampler(Sampler sampler) {
this.sampler = sampler;
}
@Override
public double sample(int x, int y, int z, WorldProperties world, BiomeProvider biomeProvider) {
return sampler.noise(world.getSeed(), x, y, z);
return sampler.getSample(world.getSeed(), x, y, z);
}
}

2
common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/math/pointset/PointSet.java
View File

@ -3,7 +3,7 @@ package com.dfsek.terra.addons.chunkgenerator.math.pointset;
import java.util.function.Supplier;
import java.util.stream.Stream;
import com.dfsek.terra.api.util.vector.Vector3Int;
import com.dfsek.seismic.type.vector.Vector3Int;
public interface PointSet extends Supplier<Stream<Vector3Int>> {

2
common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/math/pointset/generative/AdjacentPointSet.java
View File

@ -3,7 +3,7 @@ package com.dfsek.terra.addons.chunkgenerator.math.pointset.generative;
import java.util.stream.Stream;
import com.dfsek.terra.addons.chunkgenerator.math.pointset.PointSet;
import com.dfsek.terra.api.util.vector.Vector3Int;
import com.dfsek.seismic.type.vector.Vector3Int;
public class AdjacentPointSet implements PointSet {
@Override

2
common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/math/pointset/generative/SimplePointSet.java
View File

@ -4,7 +4,7 @@ import java.util.Set;
import java.util.stream.Stream;
import com.dfsek.terra.addons.chunkgenerator.math.pointset.PointSet;
import com.dfsek.terra.api.util.vector.Vector3Int;
import com.dfsek.seismic.type.vector.Vector3Int;
public class SimplePointSet implements PointSet {

2
common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/math/pointset/generative/geometric/CuboidPointSet.java
View File

@ -5,7 +5,7 @@ import java.util.Set;
import java.util.stream.Stream;
import com.dfsek.terra.addons.chunkgenerator.math.pointset.PointSet;
import com.dfsek.terra.api.util.vector.Vector3Int;
import com.dfsek.seismic.type.vector.Vector3Int;
public class CuboidPointSet implements PointSet {

10
common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/math/pointset/generative/geometric/SphericalPointSet.java
View File

@ -1,11 +1,11 @@
package com.dfsek.terra.addons.chunkgenerator.math.pointset.generative.geometric;
import net.jafama.FastMath;
import java.util.stream.Stream;
import com.dfsek.terra.addons.chunkgenerator.math.pointset.PointSet;
import com.dfsek.terra.api.util.vector.Vector3Int;
import com.dfsek.seismic.type.vector.Vector3Int;
import com.dfsek.seismic.math.floatingpoint.FloatingPointFunctions;
import com.dfsek.seismic.type.DistanceFunction;
public class SphericalPointSet implements PointSet {
@ -14,12 +14,12 @@ public class SphericalPointSet implements PointSet {
public SphericalPointSet(double radius) {
Stream.Builder<Vector3Int> streamBuilder = Stream.builder();
int roundedRadius = FastMath.ceilToInt(radius);
int roundedRadius = FloatingPointFunctions.ceil(radius);
for(int x = -roundedRadius; x <= roundedRadius; x++) {
for(int y = -roundedRadius; y <= roundedRadius; y++) {
for(int z = -roundedRadius; z <= roundedRadius; z++) {
Vector3Int pos = Vector3Int.of(x, y, z);
double length = pos.toVector3().length();
double length = pos.toFloat().length(DistanceFunction.Euclidean);
if (length == 0) continue;
if (length > radius) continue;
streamBuilder.add(pos);

2
common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/math/pointset/operative/DifferencePointSet.java
View File

@ -8,7 +8,7 @@ import java.util.stream.Collectors;
import java.util.stream.Stream;
import com.dfsek.terra.addons.chunkgenerator.math.pointset.PointSet;
import com.dfsek.terra.api.util.vector.Vector3Int;
import com.dfsek.seismic.type.vector.Vector3Int;
public class DifferencePointSet implements PointSet {

2
common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/math/pointset/operative/ExpressionFilterPointSet.java
View File

@ -8,7 +8,7 @@ import com.dfsek.paralithic.eval.tokenizer.ParseException;
import java.util.stream.Stream;
import com.dfsek.terra.addons.chunkgenerator.math.pointset.PointSet;
import com.dfsek.terra.api.util.vector.Vector3Int;
import com.dfsek.seismic.type.vector.Vector3Int;
public class ExpressionFilterPointSet implements PointSet {

2
common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/math/pointset/operative/IntersectionPointSet.java
View File

@ -8,7 +8,7 @@ import java.util.stream.Collectors;
import java.util.stream.Stream;
import com.dfsek.terra.addons.chunkgenerator.math.pointset.PointSet;
import com.dfsek.terra.api.util.vector.Vector3Int;
import com.dfsek.seismic.type.vector.Vector3Int;
public class IntersectionPointSet implements PointSet {

2
common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/math/pointset/operative/UnionPointSet.java
View File

@ -8,7 +8,7 @@ import java.util.stream.Collectors;
import java.util.stream.Stream;
import com.dfsek.terra.addons.chunkgenerator.math.pointset.PointSet;
import com.dfsek.terra.api.util.vector.Vector3Int;
import com.dfsek.seismic.type.vector.Vector3Int;
public class UnionPointSet implements PointSet {

2
common/implementation/base/src/main/java/com/dfsek/terra/config/loaders/Vector3IntLoader.java
View File

@ -10,7 +10,7 @@ import java.lang.reflect.AnnotatedType;
import java.util.List;
import java.util.Map;
import com.dfsek.terra.api.util.vector.Vector3Int;
import com.dfsek.seismic.type.vector.Vector3Int;
public class Vector3IntLoader implements TypeLoader<Vector3Int> {

2
common/implementation/base/src/main/java/com/dfsek/terra/config/loaders/Vector3Loader.java
View File

@ -10,7 +10,7 @@ import java.lang.reflect.AnnotatedType;
import java.util.List;
import java.util.Map;
import com.dfsek.terra.api.util.vector.Vector3;
import com.dfsek.seismic.type.vector.Vector3;
public class Vector3Loader implements TypeLoader<Vector3> {

10
platforms/fabric/build.gradle.kts
View File

@ -38,16 +38,6 @@ loom {
mixin {
defaultRefmapName.set("terra.fabric.refmap.json")
}
launches {
named("client") {
property("fabric.log.level", "info")
}
named("server") {
property("fabric.log.level", "info")
}
}
}