From b0bae93d067f3dd0fd1b3d64dbfd1c714c46c7b0 Mon Sep 17 00:00:00 2001 From: cyberpwn Date: Fri, 27 Aug 2021 05:08:58 -0400 Subject: [PATCH] Carving package --- .../com/volmit/iris/core/loader/IrisData.java | 2 +- .../engine/object/carving/IrisCarving.java | 50 +++++++++++++++++++ .../object/{cave => carving}/IrisCave.java | 2 +- .../{cave => carving}/IrisCavePlacer.java | 5 +- 4 files changed, 55 insertions(+), 4 deletions(-) create mode 100644 src/main/java/com/volmit/iris/engine/object/carving/IrisCarving.java rename src/main/java/com/volmit/iris/engine/object/{cave => carving}/IrisCave.java (97%) rename src/main/java/com/volmit/iris/engine/object/{cave => carving}/IrisCavePlacer.java (94%) diff --git a/src/main/java/com/volmit/iris/core/loader/IrisData.java b/src/main/java/com/volmit/iris/core/loader/IrisData.java index 97a0d2140..99a993a78 100644 --- a/src/main/java/com/volmit/iris/core/loader/IrisData.java +++ b/src/main/java/com/volmit/iris/core/loader/IrisData.java @@ -22,7 +22,7 @@ import com.volmit.iris.Iris; import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.object.biome.IrisBiome; import com.volmit.iris.engine.object.block.IrisBlockData; -import com.volmit.iris.engine.object.cave.IrisCave; +import com.volmit.iris.engine.object.carving.IrisCave; import com.volmit.iris.engine.object.common.IrisScript; import com.volmit.iris.engine.object.dimensional.IrisDimension; import com.volmit.iris.engine.object.entity.IrisEntity; diff --git a/src/main/java/com/volmit/iris/engine/object/carving/IrisCarving.java b/src/main/java/com/volmit/iris/engine/object/carving/IrisCarving.java new file mode 100644 index 000000000..4ca08713e --- /dev/null +++ b/src/main/java/com/volmit/iris/engine/object/carving/IrisCarving.java @@ -0,0 +1,50 @@ +/* + * 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.carving; + +import com.volmit.iris.engine.mantle.MantleWriter; +import com.volmit.iris.engine.object.annotations.Desc; +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; + +@Accessors(chain = true) +@NoArgsConstructor +@AllArgsConstructor +@Desc("Represents a carving configuration") +@Data +public class IrisCarving { + @Desc("Define cave placers") + private KList caves = new KList<>(); + + @BlockCoordinates + public void doCarving(MantleWriter writer, RNG rng, int x, int z) { + if(caves.isNotEmpty()) + { + for(IrisCavePlacer i : caves) + { + i.generateCave(); + } + } + } +} diff --git a/src/main/java/com/volmit/iris/engine/object/cave/IrisCave.java b/src/main/java/com/volmit/iris/engine/object/carving/IrisCave.java similarity index 97% rename from src/main/java/com/volmit/iris/engine/object/cave/IrisCave.java rename to src/main/java/com/volmit/iris/engine/object/carving/IrisCave.java index 30c3a3ff3..44924e5fb 100644 --- a/src/main/java/com/volmit/iris/engine/object/cave/IrisCave.java +++ b/src/main/java/com/volmit/iris/engine/object/carving/IrisCave.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.cave; +package com.volmit.iris.engine.object.carving; import com.volmit.iris.core.loader.IrisRegistrant; import com.volmit.iris.engine.object.annotations.Desc; diff --git a/src/main/java/com/volmit/iris/engine/object/cave/IrisCavePlacer.java b/src/main/java/com/volmit/iris/engine/object/carving/IrisCavePlacer.java similarity index 94% rename from src/main/java/com/volmit/iris/engine/object/cave/IrisCavePlacer.java rename to src/main/java/com/volmit/iris/engine/object/carving/IrisCavePlacer.java index 93c7824df..fedf5ce84 100644 --- a/src/main/java/com/volmit/iris/engine/object/cave/IrisCavePlacer.java +++ b/src/main/java/com/volmit/iris/engine/object/carving/IrisCavePlacer.java @@ -16,11 +16,12 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.cave; +package com.volmit.iris.engine.object.carving; 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.mantle.MantleWriter; import com.volmit.iris.engine.object.annotations.Desc; import com.volmit.iris.engine.object.annotations.MinNumber; import com.volmit.iris.engine.object.annotations.RegistryListResource; @@ -68,7 +69,7 @@ public class IrisCavePlacer implements IRare { return caveCache.aquire(() -> data.getCaveLoader().load(getCave())); } - public void generateCave(Mantle mantle, RNG rng, IrisData data, int x, int y, int z) { + public void generateCave(MantleWriter mantle, RNG rng, IrisData data, int x, int y, int z) { if (fail.get()) { return; }