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

move Sampler to util package

Browse Source
This commit is contained in:
dfsek 2021-09-24 12:18:57 -07:00
parent a7d0e7f49b
commit 988579b708
11 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/PaletteUtil.java
View File

@ -5,7 +5,7 @@ import com.dfsek.terra.addons.chunkgenerator.palette.SlantHolder;
import com.dfsek.terra.api.util.MathUtil; import com.dfsek.terra.api.util.MathUtil;
import com.dfsek.terra.api.world.biome.GenerationSettings; import com.dfsek.terra.api.world.biome.GenerationSettings;
import com.dfsek.terra.api.world.generator.Palette; import com.dfsek.terra.api.world.generator.Palette;
import com.dfsek.terra.api.world.generator.Sampler; import com.dfsek.terra.api.util.math.Sampler;
public final class PaletteUtil { public final class PaletteUtil {

2
common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/generators/NoiseChunkGenerator3D.java
View File

@ -26,7 +26,7 @@ import com.dfsek.terra.api.world.generator.ChunkData;
import com.dfsek.terra.api.world.generator.ChunkGenerator; import com.dfsek.terra.api.world.generator.ChunkGenerator;
import com.dfsek.terra.api.world.generator.GenerationStage; import com.dfsek.terra.api.world.generator.GenerationStage;
import com.dfsek.terra.api.world.generator.Palette; import com.dfsek.terra.api.world.generator.Palette;
import com.dfsek.terra.api.world.generator.Sampler; import com.dfsek.terra.api.util.math.Sampler;
public class NoiseChunkGenerator3D implements ChunkGenerator { public class NoiseChunkGenerator3D implements ChunkGenerator {

2
common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/samplers/Sampler3D.java
View File

@ -6,7 +6,7 @@ import com.dfsek.terra.addons.chunkgenerator.generation.math.interpolation.Chunk
import com.dfsek.terra.addons.chunkgenerator.generation.math.interpolation.ElevationInterpolator; import com.dfsek.terra.addons.chunkgenerator.generation.math.interpolation.ElevationInterpolator;
import com.dfsek.terra.api.world.World; import com.dfsek.terra.api.world.World;
import com.dfsek.terra.api.world.biome.generation.BiomeProvider; import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
import com.dfsek.terra.api.world.generator.Sampler; import com.dfsek.terra.api.util.math.Sampler;
public class Sampler3D implements Sampler { public class Sampler3D implements Sampler {

2
common/api/core/src/main/java/com/dfsek/terra/api/util/MathUtil.java
View File

@ -4,7 +4,7 @@ import net.jafama.FastMath;
import java.util.List; import java.util.List;
import com.dfsek.terra.api.world.generator.Sampler; import com.dfsek.terra.api.util.math.Sampler;
/** /**

1
common/api/core/src/main/java/com/dfsek/terra/api/world/generator/ChunkGenerator.java
View File

@ -1,5 +1,6 @@
package com.dfsek.terra.api.world.generator; package com.dfsek.terra.api.world.generator;
import com.dfsek.terra.api.util.math.Sampler;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import java.util.List; import java.util.List;

2
common/api/core/src/main/java/com/dfsek/terra/api/world/generator/SamplerCache.java
View File

@ -1,5 +1,7 @@
package com.dfsek.terra.api.world.generator; package com.dfsek.terra.api.world.generator;
import com.dfsek.terra.api.util.math.Sampler;
public interface SamplerCache { public interface SamplerCache {
Sampler get(int x, int z); Sampler get(int x, int z);

1
common/api/util/build.gradle.kts
View File

@ -1,3 +1,4 @@
dependencies { dependencies {
"shadedApi"("net.jafama:jafama:2.3.2")
} }

2
common/api/core/src/main/java/com/dfsek/terra/api/world/generator/Sampler.java → common/api/util/src/main/java/com/dfsek/terra/api/util/math/Sampler.java
View File

@ -1,4 +1,4 @@
package com.dfsek.terra.api.world.generator; package com.dfsek.terra.api.util.math;
@FunctionalInterface @FunctionalInterface
public interface Sampler { public interface Sampler {

1
common/implementation/build.gradle.kts
View File

@ -1,6 +1,5 @@
dependencies { dependencies {
"shadedApi"(project(":common:api")) "shadedApi"(project(":common:api"))
"shadedApi"(project(":common:loader:config"))
"shadedApi"(project(":common:loader:addon")) "shadedApi"(project(":common:loader:addon"))
"shadedApi"("org.apache.commons:commons-rng-core:1.3") "shadedApi"("org.apache.commons:commons-rng-core:1.3")

2
common/implementation/src/main/java/com/dfsek/terra/world/SamplerCacheImpl.java
View File

@ -9,7 +9,7 @@ import org.jetbrains.annotations.NotNull;
import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.TerraPlugin;
import com.dfsek.terra.api.util.MathUtil; import com.dfsek.terra.api.util.MathUtil;
import com.dfsek.terra.api.world.World; import com.dfsek.terra.api.world.World;
import com.dfsek.terra.api.world.generator.Sampler; import com.dfsek.terra.api.util.math.Sampler;
public class SamplerCacheImpl implements com.dfsek.terra.api.world.generator.SamplerCache { public class SamplerCacheImpl implements com.dfsek.terra.api.world.generator.SamplerCache {

1
settings.gradle.kts
View File

@ -2,7 +2,6 @@ rootProject.name = "Terra"
include("common:implementation") include("common:implementation")
include("common:loader:config")
include("common:loader:addon") include("common:loader:addon")
fun includeImmediateChildren(dir: File, type: String) { fun includeImmediateChildren(dir: File, type: String) {