Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2025-07-04 20:16:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Implement more noise patterns

Browse Source
This commit is contained in:
Hannes Greule
2020-08-15 13:17:44 +02:00
parent 4041b2aa1d
commit bb05bd24d9
10 changed files with 215 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/PatternFactory.java
View File

@ -22,11 +22,14 @@ package com.sk89q.worldedit.extension.factory;
import com.sk89q.worldedit.WorldEdit;
import com.sk89q.worldedit.extension.factory.parser.pattern.BlockCategoryPatternParser;
import com.sk89q.worldedit.extension.factory.parser.pattern.ClipboardPatternParser;
import com.sk89q.worldedit.extension.factory.parser.pattern.PerlinPatternParser;
import com.sk89q.worldedit.extension.factory.parser.pattern.RandomPatternParser;
import com.sk89q.worldedit.extension.factory.parser.pattern.RandomStatePatternParser;
import com.sk89q.worldedit.extension.factory.parser.pattern.RidgedMultiFractalPatternParser;
import com.sk89q.worldedit.extension.factory.parser.pattern.SimplexPatternParser;
import com.sk89q.worldedit.extension.factory.parser.pattern.SingleBlockPatternParser;
import com.sk89q.worldedit.extension.factory.parser.pattern.TypeOrStateApplyingPatternParser;
import com.sk89q.worldedit.extension.factory.parser.pattern.VoronoiPatternParser;
import com.sk89q.worldedit.function.pattern.Pattern;
import com.sk89q.worldedit.internal.registry.AbstractFactory;
@ -58,6 +61,9 @@ public final class PatternFactory extends AbstractFactory<Pattern> {
// FAWE
register(new SimplexPatternParser(worldEdit));
register(new VoronoiPatternParser(worldEdit));
register(new PerlinPatternParser(worldEdit));
register(new RidgedMultiFractalPatternParser(worldEdit));
}
}

74
worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/parser/pattern/NoisePatternParser.java Normal file
View File

@ -0,0 +1,74 @@
package com.sk89q.worldedit.extension.factory.parser.pattern;
import com.boydti.fawe.object.random.NoiseRandom;
import com.sk89q.worldedit.WorldEdit;
import com.sk89q.worldedit.extension.factory.parser.RichParser;
import com.sk89q.worldedit.extension.input.InputParseException;
import com.sk89q.worldedit.extension.input.ParserContext;
import com.sk89q.worldedit.function.pattern.Pattern;
import com.sk89q.worldedit.function.pattern.RandomPattern;
import com.sk89q.worldedit.math.noise.NoiseGenerator;
import com.sk89q.worldedit.world.block.BlockStateHolder;
import org.jetbrains.annotations.NotNull;
import java.util.function.Supplier;
import java.util.stream.Stream;
public abstract class NoisePatternParser extends RichParser<Pattern> {
private final String name;
private final Supplier<NoiseGenerator> generatorSupplier;
/**
* Create a new noise parser with a defined name, e.g. {@code #simplex}.
*
* @param worldEdit the worldedit instance.
* @param name the name of this noise.
* @param generatorSupplier the supplier to get a {@link NoiseGenerator} instance from.
*/
protected NoisePatternParser(WorldEdit worldEdit, String name, Supplier<NoiseGenerator> generatorSupplier) {
super(worldEdit, '#' + name);
this.name = name;
this.generatorSupplier = generatorSupplier;
}
@Override
protected Stream<String> getSuggestions(String argumentInput, int index) {
if (index == 0) {
return suggestPositiveDoubles(argumentInput);
}
if (index == 1) {
return worldEdit.getPatternFactory().getSuggestions(argumentInput).stream();
}
return Stream.empty();
}
@Override
protected Pattern parseFromInput(@NotNull String[] arguments, ParserContext context) {
if (arguments.length != 2) {
throw new InputParseException(this.name + " requires a scale and a pattern, e.g. #"
+ this.name + "[5][dirt,stone]");
}
double scale = parseScale(arguments[0]);
Pattern inner = worldEdit.getPatternFactory().parseFromInput(arguments[1], context);
if (inner instanceof RandomPattern) {
return new RandomPattern(new NoiseRandom(this.generatorSupplier.get(), scale), (RandomPattern) inner);
} else if (inner instanceof BlockStateHolder) {
return inner; // single blocks won't have any impact on how a noise behaves
} else {
throw new InputParseException("Pattern " + inner.getClass().getSimpleName()
+ " cannot be used with #" + this.name);
}
}
/**
* Modifies the given argument to match the requirements of the noise generator.
*
* @param argument the parsed scale argument.
* @return the modified scale.
*/
protected double parseScale(String argument) {
double scale = Double.parseDouble(argument);
return 1d / Math.max(1, scale);
}
}

17
worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/parser/pattern/PerlinPatternParser.java Normal file
View File

@ -0,0 +1,17 @@
package com.sk89q.worldedit.extension.factory.parser.pattern;
import com.sk89q.worldedit.WorldEdit;
import com.sk89q.worldedit.math.noise.PerlinNoise;
public class PerlinPatternParser extends NoisePatternParser {
private static final String PERLIN_NAME = "perlin";
/**
* Create a new perlin noise parser.
*
* @param worldEdit the worldedit instance.
*/
public PerlinPatternParser(WorldEdit worldEdit) {
super(worldEdit, PERLIN_NAME, PerlinNoise::new);
}
}

18
worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/parser/pattern/RidgedMultiFractalPatternParser.java Normal file
View File

@ -0,0 +1,18 @@
package com.sk89q.worldedit.extension.factory.parser.pattern;
import com.sk89q.worldedit.WorldEdit;
import com.sk89q.worldedit.math.noise.RidgedMultiFractalNoise;
public class RidgedMultiFractalPatternParser extends NoisePatternParser {
private static final String RIDGED_MULTI_FRACTAL_NAME = "rmf";
/**
* Create a new ridged multi fractal noise parser.
*
* @param worldEdit the worldedit instance.
*/
public RidgedMultiFractalPatternParser(WorldEdit worldEdit) {
super(worldEdit, RIDGED_MULTI_FRACTAL_NAME, RidgedMultiFractalNoise::new);
}
}

45
worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/parser/pattern/SimplexPatternParser.java
View File

@ -1,49 +1,12 @@
package com.sk89q.worldedit.extension.factory.parser.pattern;
import com.boydti.fawe.object.random.SimplexRandom;
import com.sk89q.worldedit.WorldEdit;
import com.sk89q.worldedit.extension.factory.parser.RichParser;
import com.sk89q.worldedit.extension.input.InputParseException;
import com.sk89q.worldedit.extension.input.ParserContext;
import com.sk89q.worldedit.function.pattern.Pattern;
import com.sk89q.worldedit.function.pattern.RandomPattern;
import com.sk89q.worldedit.world.block.BlockStateHolder;
import org.jetbrains.annotations.NotNull;
import com.sk89q.worldedit.math.noise.SimplexNoiseGenerator;
import java.util.stream.Stream;
public class SimplexPatternParser extends RichParser<Pattern> {
private static final String SIMPLEX_PREFIX = "#simplex";
public class SimplexPatternParser extends NoisePatternParser {
private static final String SIMPLEX_NAME = "simplex";
public SimplexPatternParser(WorldEdit worldEdit) {
super(worldEdit, SIMPLEX_PREFIX);
}
@Override
protected Stream<String> getSuggestions(String argumentInput, int index) {
if (index == 0) {
return suggestPositiveDoubles(argumentInput);
}
if (index == 1) {
return worldEdit.getPatternFactory().getSuggestions(argumentInput).stream();
}
return Stream.empty();
}
@Override
protected Pattern parseFromInput(@NotNull String[] arguments, ParserContext context) {
if (arguments.length != 2) {
throw new InputParseException("Simplex requires a scale and a pattern, e.g. #simplex[5][dirt,stone]");
}
double scale = Double.parseDouble(arguments[0]);
scale = 1d / Math.max(1, scale);
Pattern inner = worldEdit.getPatternFactory().parseFromInput(arguments[1], context);
if (inner instanceof RandomPattern) {
return new RandomPattern(new SimplexRandom(scale), (RandomPattern) inner);
} else if (inner instanceof BlockStateHolder) {
return inner; // single blocks won't have any impact on how simplex behaves
} else {
throw new InputParseException("Pattern " + inner.getClass().getSimpleName() + " cannot be used with #simplex");
}
super(worldEdit, SIMPLEX_NAME, SimplexNoiseGenerator::new);
}
}

18
worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/parser/pattern/VoronoiPatternParser.java Normal file
View File

@ -0,0 +1,18 @@
package com.sk89q.worldedit.extension.factory.parser.pattern;
import com.sk89q.worldedit.WorldEdit;
import com.sk89q.worldedit.math.noise.VoronoiNoise;
public class VoronoiPatternParser extends NoisePatternParser {
private static final String VORONOI_NAME = "voronoi";
/**
* Create a new voronoi noise parser.
*
* @param worldEdit the worldedit instance.
*/
public VoronoiPatternParser(WorldEdit worldEdit) {
super(worldEdit, VORONOI_NAME, VoronoiNoise::new);
}
}