From e2d07f7e787542e234fa5c4c02705d07874a7108 Mon Sep 17 00:00:00 2001 From: cyberpwn Date: Sat, 4 Sep 2021 14:00:45 -0400 Subject: [PATCH] Fluid body configuration for lakes & rivers --- .../iris/engine/object/IrisFluidBodies.java | 33 +++++----- .../volmit/iris/engine/object/IrisLake.java | 59 +++++++++++++++++ .../volmit/iris/engine/object/IrisRiver.java | 63 +++++++++++++++++++ 3 files changed, 136 insertions(+), 19 deletions(-) create mode 100644 src/main/java/com/volmit/iris/engine/object/IrisLake.java create mode 100644 src/main/java/com/volmit/iris/engine/object/IrisRiver.java diff --git a/src/main/java/com/volmit/iris/engine/object/IrisFluidBodies.java b/src/main/java/com/volmit/iris/engine/object/IrisFluidBodies.java index 8d996a9c5..d8edc5dac 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisFluidBodies.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisFluidBodies.java @@ -32,37 +32,32 @@ import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.Accessors; -@Snippet("carving") +@Snippet("fluid-bodies") @Accessors(chain = true) @NoArgsConstructor @AllArgsConstructor -@Desc("Represents a carving configuration") +@Desc("Represents a fluid body configuration") @Data public class IrisFluidBodies { - @ArrayType(type = IrisCavePlacer.class, min = 1) - @Desc("Define cave placers") - private KList rivers = new KList<>(); + @ArrayType(type = IrisRiver.class, min = 1) + @Desc("Define rivers") + private KList rivers = new KList<>(); - @ArrayType(type = IrisRavinePlacer.class, min = 1) - @Desc("Define ravine placers") - private KList lakes = new KList<>(); + @ArrayType(type = IrisLake.class, min = 1) + @Desc("Define lakes") + private KList lakes = new KList<>(); @BlockCoordinates public void doCarving(MantleWriter writer, RNG rng, Engine engine, int x, int y, int z) { - doCarving(writer, rng, engine, x, y, z, -1); - } - - @BlockCoordinates - public void doCarving(MantleWriter writer, RNG rng, Engine engine, int x, int y, int z, int waterHint) { if (rivers.isNotEmpty()) { - for (IrisCavePlacer i : rivers) { - i.generateCave(writer, rng, engine, x, y, z, waterHint); + for (IrisRiver i : rivers) { + i.generate(writer, rng, engine, x, y, z); } } if (lakes.isNotEmpty()) { - for (IrisRavinePlacer i : lakes) { - i.generateRavine(writer, rng, engine, x, y, z, waterHint); + for (IrisLake i : lakes) { + i.generate(writer, rng, engine, x, y, z); } } } @@ -70,11 +65,11 @@ public class IrisFluidBodies { public int getMaxRange(IrisData data) { int max = 0; - for (IrisCavePlacer i : rivers) { + for (IrisRiver i : rivers) { max = Math.max(max, i.getSize(data)); } - for (IrisCavePlacer i : rivers) { + for (IrisLake i : lakes) { max = Math.max(max, i.getSize(data)); } diff --git a/src/main/java/com/volmit/iris/engine/object/IrisLake.java b/src/main/java/com/volmit/iris/engine/object/IrisLake.java new file mode 100644 index 000000000..781b6ed7f --- /dev/null +++ b/src/main/java/com/volmit/iris/engine/object/IrisLake.java @@ -0,0 +1,59 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.volmit.iris.engine.object; + +import com.volmit.iris.core.loader.IrisData; +import com.volmit.iris.engine.framework.Engine; +import com.volmit.iris.engine.mantle.MantleWriter; +import com.volmit.iris.engine.object.annotations.*; +import com.volmit.iris.util.math.RNG; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.Accessors; + +@Snippet("lake") +@Accessors(chain = true) +@NoArgsConstructor +@AllArgsConstructor +@Desc("Represents an Iris Lake") +@Data +public class IrisLake implements IRare { + @Required + @Desc("Typically a 1 in RARITY on a per chunk/fork basis") + @MinNumber(1) + private int rarity = 15; + + @Desc("The width style of this lake") + private IrisStyledRange width = new IrisStyledRange(6, 9, NoiseStyle.PERLIN.style()); + + @Desc("Define the shape of this lake") + private IrisWorm worm = new IrisWorm(); + + @RegistryListResource(IrisBiome.class) + @Desc("Force this lake to only generate the specified custom biome") + private String customBiome = ""; + + public int getSize(IrisData data) { + return worm.getMaxDistance(); + } + + public void generate(MantleWriter writer, RNG rng, Engine engine, int x, int y, int z) { + } +} diff --git a/src/main/java/com/volmit/iris/engine/object/IrisRiver.java b/src/main/java/com/volmit/iris/engine/object/IrisRiver.java new file mode 100644 index 000000000..cad2e61b1 --- /dev/null +++ b/src/main/java/com/volmit/iris/engine/object/IrisRiver.java @@ -0,0 +1,63 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.volmit.iris.engine.object; + +import com.volmit.iris.Iris; +import com.volmit.iris.core.loader.IrisData; +import com.volmit.iris.engine.data.cache.AtomicCache; +import com.volmit.iris.engine.framework.Engine; +import com.volmit.iris.engine.mantle.MantleWriter; +import com.volmit.iris.engine.object.annotations.*; +import com.volmit.iris.util.math.RNG; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.Accessors; + +import java.util.concurrent.atomic.AtomicBoolean; + +@Snippet("river") +@Accessors(chain = true) +@NoArgsConstructor +@AllArgsConstructor +@Desc("Represents an Iris river") +@Data +public class IrisRiver implements IRare { + @Required + @Desc("Typically a 1 in RARITY on a per chunk/fork basis") + @MinNumber(1) + private int rarity = 15; + + @Desc("The width style of this river") + private IrisStyledRange width = new IrisStyledRange(3, 6, NoiseStyle.PERLIN.style()); + + @Desc("Define the shape of this river") + private IrisWorm worm = new IrisWorm(); + + @RegistryListResource(IrisBiome.class) + @Desc("Force this river to only generate the specified custom biome") + private String customBiome = ""; + + public int getSize(IrisData data) { + return worm.getMaxDistance(); + } + + public void generate(MantleWriter writer, RNG rng, Engine engine, int x, int y, int z) { + } +}