Fluid body configuration for lakes & rivers

This commit is contained in:
cyberpwn 2021-09-04 14:00:45 -04:00
parent 3aa0fac852
commit e2d07f7e78
3 changed files with 136 additions and 19 deletions

View File

@ -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<IrisCavePlacer> rivers = new KList<>();
@ArrayType(type = IrisRiver.class, min = 1)
@Desc("Define rivers")
private KList<IrisRiver> rivers = new KList<>();
@ArrayType(type = IrisRavinePlacer.class, min = 1)
@Desc("Define ravine placers")
private KList<IrisRavinePlacer> lakes = new KList<>();
@ArrayType(type = IrisLake.class, min = 1)
@Desc("Define lakes")
private KList<IrisLake> 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));
}

View File

@ -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 <https://www.gnu.org/licenses/>.
*/
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) {
}
}

View File

@ -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 <https://www.gnu.org/licenses/>.
*/
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) {
}
}