From 672cf599727e5165833aaa26dc6fc99391dbc567 Mon Sep 17 00:00:00 2001 From: dfsek Date: Sat, 4 Dec 2021 19:04:11 -0700 Subject: [PATCH] move Sampler to chunk generator addon --- .../generation/generators/NoiseChunkGenerator3D.java | 2 +- .../addons/chunkgenerator/generation/math/PaletteUtil.java | 2 +- .../chunkgenerator/generation/math/samplers}/Sampler.java | 2 +- .../chunkgenerator/generation/math/samplers/Sampler3D.java | 1 - .../generation/math/samplers/SamplerProviderImpl.java | 1 - 5 files changed, 3 insertions(+), 5 deletions(-) rename common/{api/util/src/main/java/com/dfsek/terra/api/util/math => addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/samplers}/Sampler.java (88%) diff --git a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/generators/NoiseChunkGenerator3D.java b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/generators/NoiseChunkGenerator3D.java index 75ec56358..8c0a0b4ee 100644 --- a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/generators/NoiseChunkGenerator3D.java +++ b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/generators/NoiseChunkGenerator3D.java @@ -23,7 +23,7 @@ import com.dfsek.terra.api.Platform; import com.dfsek.terra.api.block.state.BlockState; import com.dfsek.terra.api.config.ConfigPack; import com.dfsek.terra.api.profiler.ProfileFrame; -import com.dfsek.terra.api.util.math.Sampler; +import com.dfsek.terra.addons.chunkgenerator.generation.math.samplers.Sampler; import com.dfsek.terra.api.world.ServerWorld; import com.dfsek.terra.api.world.WritableWorld; import com.dfsek.terra.api.world.biome.Biome; diff --git a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/PaletteUtil.java b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/PaletteUtil.java index a5e73b696..8fab4d221 100644 --- a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/PaletteUtil.java +++ b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/PaletteUtil.java @@ -9,7 +9,7 @@ package com.dfsek.terra.addons.chunkgenerator.generation.math; import com.dfsek.terra.addons.chunkgenerator.palette.PaletteInfo; import com.dfsek.terra.addons.chunkgenerator.palette.SlantHolder; -import com.dfsek.terra.api.util.math.Sampler; +import com.dfsek.terra.addons.chunkgenerator.generation.math.samplers.Sampler; import com.dfsek.terra.api.world.chunk.generation.util.Palette; diff --git a/common/api/util/src/main/java/com/dfsek/terra/api/util/math/Sampler.java b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/samplers/Sampler.java similarity index 88% rename from common/api/util/src/main/java/com/dfsek/terra/api/util/math/Sampler.java rename to common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/samplers/Sampler.java index 74999723f..25125afe1 100644 --- a/common/api/util/src/main/java/com/dfsek/terra/api/util/math/Sampler.java +++ b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/samplers/Sampler.java @@ -5,7 +5,7 @@ * reference the LICENSE file in the common/api directory. */ -package com.dfsek.terra.api.util.math; +package com.dfsek.terra.addons.chunkgenerator.generation.math.samplers; @FunctionalInterface public interface Sampler { diff --git a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/samplers/Sampler3D.java b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/samplers/Sampler3D.java index 1ce0285a6..4811f90dd 100644 --- a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/samplers/Sampler3D.java +++ b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/samplers/Sampler3D.java @@ -11,7 +11,6 @@ import net.jafama.FastMath; import com.dfsek.terra.addons.chunkgenerator.generation.math.interpolation.ChunkInterpolator3D; import com.dfsek.terra.addons.chunkgenerator.generation.math.interpolation.ElevationInterpolator; -import com.dfsek.terra.api.util.math.Sampler; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; diff --git a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/samplers/SamplerProviderImpl.java b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/samplers/SamplerProviderImpl.java index 8b4b2822c..9f432417c 100644 --- a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/samplers/SamplerProviderImpl.java +++ b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/samplers/SamplerProviderImpl.java @@ -28,7 +28,6 @@ import org.jetbrains.annotations.NotNull; import com.dfsek.terra.api.Platform; import com.dfsek.terra.api.util.MathUtil; import com.dfsek.terra.api.util.generic.pair.Pair; -import com.dfsek.terra.api.util.math.Sampler; import com.dfsek.terra.api.world.biome.generation.BiomeProvider;