diff --git a/common/addons/chunk-generator-layered/build.gradle.kts b/common/addons/chunk-generator-layered/build.gradle.kts index 4065850b0..29e3850bc 100644 --- a/common/addons/chunk-generator-layered/build.gradle.kts +++ b/common/addons/chunk-generator-layered/build.gradle.kts @@ -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("shadowJar") { diff --git a/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/config/palette/DotProductLayerPaletteTemplate.java b/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/config/palette/DotProductLayerPaletteTemplate.java index 6d8fed140..400cc5dc9 100644 --- a/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/config/palette/DotProductLayerPaletteTemplate.java +++ b/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/config/palette/DotProductLayerPaletteTemplate.java @@ -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; diff --git a/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/config/pointset/generative/SimplePointSetTemplate.java b/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/config/pointset/generative/SimplePointSetTemplate.java index b8104cf07..825c4724e 100644 --- a/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/config/pointset/generative/SimplePointSetTemplate.java +++ b/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/config/pointset/generative/SimplePointSetTemplate.java @@ -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 { diff --git a/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/config/predicate/RangeLayerPredicateTemplate.java b/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/config/predicate/RangeLayerPredicateTemplate.java index fec9f8a77..37904c541 100644 --- a/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/config/predicate/RangeLayerPredicateTemplate.java +++ b/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/config/predicate/RangeLayerPredicateTemplate.java @@ -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 { diff --git a/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/config/sampler/BiomeDefinedLayerSamplerTemplate.java b/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/config/sampler/BiomeDefinedLayerSamplerTemplate.java index 4fb7965c3..510aaeef2 100644 --- a/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/config/sampler/BiomeDefinedLayerSamplerTemplate.java +++ b/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/config/sampler/BiomeDefinedLayerSamplerTemplate.java @@ -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 { @Value("default") @Default - private @Meta NoiseSampler defaultSampler = null; + private @Meta Sampler defaultSampler = null; @Override public LayerSampler get() { diff --git a/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/config/sampler/SimpleLayerSamplerTemplate.java b/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/config/sampler/SimpleLayerSamplerTemplate.java index 46bd115d6..3efa80e59 100644 --- a/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/config/sampler/SimpleLayerSamplerTemplate.java +++ b/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/config/sampler/SimpleLayerSamplerTemplate.java @@ -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 { @Value("sampler") - private @Meta NoiseSampler sampler; + private @Meta Sampler sampler; @Override public LayerSampler get() { diff --git a/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/layer/palette/DotProductLayerPalette.java b/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/layer/palette/DotProductLayerPalette.java index 8da5d5f7b..1a8b0c2e6 100644 --- a/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/layer/palette/DotProductLayerPalette.java +++ b/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/layer/palette/DotProductLayerPalette.java @@ -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())); } diff --git a/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/layer/predicate/RangeLayerPredicate.java b/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/layer/predicate/RangeLayerPredicate.java index c7d108a11..c08eaf6ee 100644 --- a/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/layer/predicate/RangeLayerPredicate.java +++ b/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/layer/predicate/RangeLayerPredicate.java @@ -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; diff --git a/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/layer/predicate/SamplerListLayerPredicate.java b/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/layer/predicate/SamplerListLayerPredicate.java index a0796be8c..7ec83ca35 100644 --- a/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/layer/predicate/SamplerListLayerPredicate.java +++ b/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/layer/predicate/SamplerListLayerPredicate.java @@ -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; diff --git a/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/layer/sampler/BiomeDefinedLayerSampler.java b/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/layer/sampler/BiomeDefinedLayerSampler.java index 804acdf0d..3c5390aaa 100644 --- a/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/layer/sampler/BiomeDefinedLayerSampler.java +++ b/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/layer/sampler/BiomeDefinedLayerSampler.java @@ -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 getDefaultSampler() { + private Optional 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 value = DynamicValue.builder("generation.samplers." + id, NoiseSampler.class); + DynamicValue.Builder 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 samplerMap = samplerFields.entrySet().stream().collect( - Collectors.toMap(Entry::getKey, entry -> layerSamplerBiomeTemplate.get(entry.getValue(), NoiseSampler.class))); + Map 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 samplers) implements Properties { + public record BiomeLayerSamplers(Map samplers) implements Properties { } } diff --git a/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/layer/sampler/SimpleLayerSampler.java b/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/layer/sampler/SimpleLayerSampler.java index 40177b0b2..3dd1de70f 100644 --- a/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/layer/sampler/SimpleLayerSampler.java +++ b/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/layer/sampler/SimpleLayerSampler.java @@ -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); } } diff --git a/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/math/pointset/PointSet.java b/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/math/pointset/PointSet.java index 16466fd6a..bd00a1959 100644 --- a/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/math/pointset/PointSet.java +++ b/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/math/pointset/PointSet.java @@ -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> { diff --git a/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/math/pointset/generative/AdjacentPointSet.java b/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/math/pointset/generative/AdjacentPointSet.java index e6788a455..cf1d73971 100644 --- a/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/math/pointset/generative/AdjacentPointSet.java +++ b/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/math/pointset/generative/AdjacentPointSet.java @@ -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 diff --git a/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/math/pointset/generative/SimplePointSet.java b/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/math/pointset/generative/SimplePointSet.java index e1e50bdc0..c962e09a4 100644 --- a/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/math/pointset/generative/SimplePointSet.java +++ b/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/math/pointset/generative/SimplePointSet.java @@ -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 { diff --git a/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/math/pointset/generative/geometric/CuboidPointSet.java b/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/math/pointset/generative/geometric/CuboidPointSet.java index 08e8d746f..25ac2430b 100644 --- a/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/math/pointset/generative/geometric/CuboidPointSet.java +++ b/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/math/pointset/generative/geometric/CuboidPointSet.java @@ -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 { diff --git a/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/math/pointset/generative/geometric/SphericalPointSet.java b/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/math/pointset/generative/geometric/SphericalPointSet.java index 5621fadef..859112d6e 100644 --- a/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/math/pointset/generative/geometric/SphericalPointSet.java +++ b/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/math/pointset/generative/geometric/SphericalPointSet.java @@ -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 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); diff --git a/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/math/pointset/operative/DifferencePointSet.java b/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/math/pointset/operative/DifferencePointSet.java index ed958bf1a..4649f0a3c 100644 --- a/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/math/pointset/operative/DifferencePointSet.java +++ b/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/math/pointset/operative/DifferencePointSet.java @@ -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 { diff --git a/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/math/pointset/operative/ExpressionFilterPointSet.java b/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/math/pointset/operative/ExpressionFilterPointSet.java index 8906446e9..f91d5180a 100644 --- a/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/math/pointset/operative/ExpressionFilterPointSet.java +++ b/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/math/pointset/operative/ExpressionFilterPointSet.java @@ -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 { diff --git a/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/math/pointset/operative/IntersectionPointSet.java b/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/math/pointset/operative/IntersectionPointSet.java index 0dbe0c498..a7ea9c5c6 100644 --- a/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/math/pointset/operative/IntersectionPointSet.java +++ b/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/math/pointset/operative/IntersectionPointSet.java @@ -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 { diff --git a/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/math/pointset/operative/UnionPointSet.java b/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/math/pointset/operative/UnionPointSet.java index bd01c1c68..c808ba2e3 100644 --- a/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/math/pointset/operative/UnionPointSet.java +++ b/common/addons/chunk-generator-layered/src/main/java/com/dfsek/terra/addons/chunkgenerator/math/pointset/operative/UnionPointSet.java @@ -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 { diff --git a/common/implementation/base/src/main/java/com/dfsek/terra/config/loaders/Vector3IntLoader.java b/common/implementation/base/src/main/java/com/dfsek/terra/config/loaders/Vector3IntLoader.java index 06d470594..74b720b82 100644 --- a/common/implementation/base/src/main/java/com/dfsek/terra/config/loaders/Vector3IntLoader.java +++ b/common/implementation/base/src/main/java/com/dfsek/terra/config/loaders/Vector3IntLoader.java @@ -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 { diff --git a/common/implementation/base/src/main/java/com/dfsek/terra/config/loaders/Vector3Loader.java b/common/implementation/base/src/main/java/com/dfsek/terra/config/loaders/Vector3Loader.java index cdfffe15a..38b1a7a7e 100644 --- a/common/implementation/base/src/main/java/com/dfsek/terra/config/loaders/Vector3Loader.java +++ b/common/implementation/base/src/main/java/com/dfsek/terra/config/loaders/Vector3Loader.java @@ -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 { diff --git a/platforms/fabric/build.gradle.kts b/platforms/fabric/build.gradle.kts index b8a52b02e..1738c17c6 100644 --- a/platforms/fabric/build.gradle.kts +++ b/platforms/fabric/build.gradle.kts @@ -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") - } - } - }