Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2025-01-01 14:07:43 +01:00
Code Issues Projects Releases Wiki Activity

Update JNoise to 4.0.0-SNAPSHOT. (#884)

Browse Source
This commit is contained in:
Articdive 2022-04-26 12:31:00 +02:00 committed by GitHub
parent 42c6e75906
commit 501020a453
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
demo/src/main/java/net/minestom/demo/generator/NoiseTestGenerator.java
View File

@ -1,43 +1,30 @@
package net.minestom.demo.generator; package net.minestom.demo.generator;
import de.articdive.jnoise.JNoise; import de.articdive.jnoise.generators.noise_parameters.interpolation.Interpolation;
import de.articdive.jnoise.interpolation.InterpolationType; import de.articdive.jnoise.generators.noisegen.opensimplex.FastSimplexNoiseGenerator;
import de.articdive.jnoise.generators.noisegen.perlin.PerlinNoiseGenerator;
import de.articdive.jnoise.pipeline.JNoise;
import net.minestom.server.coordinate.Point; import net.minestom.server.coordinate.Point;
import net.minestom.server.coordinate.Vec; import net.minestom.server.coordinate.Vec;
import net.minestom.server.instance.Chunk; import net.minestom.server.instance.Chunk;
import net.minestom.server.instance.ChunkGenerator;
import net.minestom.server.instance.ChunkPopulator;
import net.minestom.server.instance.batch.ChunkBatch;
import net.minestom.server.instance.block.Block; import net.minestom.server.instance.block.Block;
import net.minestom.server.instance.generator.GenerationUnit; import net.minestom.server.instance.generator.GenerationUnit;
import net.minestom.server.instance.generator.Generator; import net.minestom.server.instance.generator.Generator;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import java.util.ArrayList;
import java.util.List;
import java.util.Random;
public class NoiseTestGenerator implements Generator { public class NoiseTestGenerator implements Generator {
public NoiseTestGenerator() {
treeNoise.getNoise(0, 0);
jNoise.getNoise(0, 0);
}
private final JNoise treeNoise = JNoise.newBuilder() private final JNoise treeNoise = JNoise.newBuilder()
.fastSimplex() .fastSimplex(FastSimplexNoiseGenerator.newBuilder().setSeed(123).build())
.setFrequency(999) .scale(999)
.setSeed(123)
.build(); .build();
private final JNoise jNoise = JNoise.newBuilder() private final JNoise jNoise = JNoise.newBuilder()
.perlin() .perlin(PerlinNoiseGenerator.newBuilder().setSeed(123).setInterpolation(Interpolation.LINEAR).build())
.setInterpolation(InterpolationType.LINEAR) .scale(0.4).build();
.setSeed(123)
.setFrequency(0.4).build();
public int getHeight(int x, int z) { public int getHeight(int x, int z) {
double preHeight = jNoise.getNoise(x / 16.0, z / 16.0); double preHeight = jNoise.evaluateNoise(x / 16.0, z / 16.0);
return (int) ((preHeight > 0 ? preHeight * 6 : preHeight * 4) + 64); return (int) ((preHeight > 0 ? preHeight * 6 : preHeight * 4) + 64);
} }
@ -68,7 +55,7 @@ public class NoiseTestGenerator implements Generator {
unit.modifier().fill(pos.withY(pos.y() - 1), posp1, Block.GRASS_BLOCK); unit.modifier().fill(pos.withY(pos.y() - 1), posp1, Block.GRASS_BLOCK);
unit.modifier().fill(pos.withY(0), posp1.withY(1), Block.BEDROCK); unit.modifier().fill(pos.withY(0), posp1.withY(1), Block.BEDROCK);
if (treeNoise.getNoise(pos.x(), pos.z()) > 0.8) { if (treeNoise.evaluateNoise(pos.x(), pos.z()) > 0.8) {
TreePopulator.populate(pos, unit); TreePopulator.populate(pos, unit);
} }
} }
@ -148,5 +135,8 @@ public class NoiseTestGenerator implements Generator {
setter.setBlock(origin.add(-1, 4, -1), Block.OAK_LEAVES); setter.setBlock(origin.add(-1, 4, -1), Block.OAK_LEAVES);
}); });
} }
} }
} }

4
gradle/libs.versions.toml
View File

@ -31,7 +31,7 @@ mockito = "4.2.0"
javaPoet = "1.13.0" javaPoet = "1.13.0"
# Demo # Demo
jNoise = "3.0.1" jNoise = "b93008e35e"
# JMH # JMH
jmh = "1.35" jmh = "1.35"
@ -86,7 +86,7 @@ mockito-core = { group = "org.mockito", name = "mockito-core", version.ref = "mo
javaPoet = { group = "com.squareup", name = "javapoet", version.ref = "javaPoet" } javaPoet = { group = "com.squareup", name = "javapoet", version.ref = "javaPoet" }
# Demo # Demo
jNoise = { group = "com.github.Articdive", name = "JNoise", version.ref = "jNoise" } jNoise = { group = "com.github.Articdive.JNoise", name = "jnoise-pipeline", version.ref = "jNoise" }
# JMH # JMH
jmh-core = { group = "org.openjdk.jmh", name = "jmh-core", version.ref = "jmh" } jmh-core = { group = "org.openjdk.jmh", name = "jmh-core", version.ref = "jmh" }