From 3aa0fac8520be6c684efe5e511517fb9e4824a4e Mon Sep 17 00:00:00 2001 From: cyberpwn Date: Sat, 4 Sep 2021 13:55:59 -0400 Subject: [PATCH] Fluid body configuration --- .../volmit/iris/engine/object/IrisBiome.java | 3 + .../iris/engine/object/IrisDimension.java | 3 + .../iris/engine/object/IrisFluidBodies.java | 84 +++++++++++++++++++ .../volmit/iris/engine/object/IrisRegion.java | 3 + 4 files changed, 93 insertions(+) create mode 100644 src/main/java/com/volmit/iris/engine/object/IrisFluidBodies.java diff --git a/src/main/java/com/volmit/iris/engine/object/IrisBiome.java b/src/main/java/com/volmit/iris/engine/object/IrisBiome.java index a64167d35..12592b8ed 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisBiome.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisBiome.java @@ -103,6 +103,9 @@ public class IrisBiome extends IrisRegistrant implements IRare { @Desc("Carving configuration for the dimension") private IrisCarving carving = new IrisCarving(); + @Desc("Configuration of fluid bodies such as rivers & lakes") + private IrisFluidBodies fluidBodies = new IrisFluidBodies(); + @MinNumber(1) @MaxNumber(512) @Desc("The rarity of this biome (integer)") diff --git a/src/main/java/com/volmit/iris/engine/object/IrisDimension.java b/src/main/java/com/volmit/iris/engine/object/IrisDimension.java index e916609eb..75b5faa2a 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisDimension.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisDimension.java @@ -165,6 +165,9 @@ public class IrisDimension extends IrisRegistrant { @Desc("Carving configuration for the dimension") private IrisCarving carving = new IrisCarving(); + @Desc("Configuration of fluid bodies such as rivers & lakes") + private IrisFluidBodies fluidBodies = new IrisFluidBodies(); + @Desc("The world environment") private Environment environment = Environment.NORMAL; diff --git a/src/main/java/com/volmit/iris/engine/object/IrisFluidBodies.java b/src/main/java/com/volmit/iris/engine/object/IrisFluidBodies.java new file mode 100644 index 000000000..8d996a9c5 --- /dev/null +++ b/src/main/java/com/volmit/iris/engine/object/IrisFluidBodies.java @@ -0,0 +1,84 @@ +/* + * 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.ArrayType; +import com.volmit.iris.engine.object.annotations.Desc; +import com.volmit.iris.engine.object.annotations.Snippet; +import com.volmit.iris.util.collection.KList; +import com.volmit.iris.util.documentation.BlockCoordinates; +import com.volmit.iris.util.math.RNG; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.Accessors; + +@Snippet("carving") +@Accessors(chain = true) +@NoArgsConstructor +@AllArgsConstructor +@Desc("Represents a carving configuration") +@Data +public class IrisFluidBodies { + @ArrayType(type = IrisCavePlacer.class, min = 1) + @Desc("Define cave placers") + private KList rivers = new KList<>(); + + @ArrayType(type = IrisRavinePlacer.class, min = 1) + @Desc("Define ravine placers") + 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); + } + } + + if (lakes.isNotEmpty()) { + for (IrisRavinePlacer i : lakes) { + i.generateRavine(writer, rng, engine, x, y, z, waterHint); + } + } + } + + public int getMaxRange(IrisData data) { + int max = 0; + + for (IrisCavePlacer i : rivers) { + max = Math.max(max, i.getSize(data)); + } + + for (IrisCavePlacer i : rivers) { + max = Math.max(max, i.getSize(data)); + } + + + return max; + } +} diff --git a/src/main/java/com/volmit/iris/engine/object/IrisRegion.java b/src/main/java/com/volmit/iris/engine/object/IrisRegion.java index 1d4c163fe..338ee67fb 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisRegion.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisRegion.java @@ -131,6 +131,9 @@ public class IrisRegion extends IrisRegistrant implements IRare { @Desc("Carving configuration for the dimension") private IrisCarving carving = new IrisCarving(); + @Desc("Configuration of fluid bodies such as rivers & lakes") + private IrisFluidBodies fluidBodies = new IrisFluidBodies(); + @RegistryListResource(IrisBiome.class) @Required @ArrayType(min = 1, type = String.class)