diff --git a/src/main/java/com/volmit/iris/engine/actuator/IrisDecorantActuator.java b/src/main/java/com/volmit/iris/engine/actuator/IrisDecorantActuator.java index 398413ff0..09c84d3cf 100644 --- a/src/main/java/com/volmit/iris/engine/actuator/IrisDecorantActuator.java +++ b/src/main/java/com/volmit/iris/engine/actuator/IrisDecorantActuator.java @@ -134,7 +134,7 @@ public class IrisDecorantActuator extends EngineAssignedActuator { getSeaFloorDecorator().decorate(i, j, realX, realZ, output, cave, k + 1, liquidFor + lastSolid - emptyFor); getSeaSurfaceDecorator().decorate(i, j, realX, realZ, output, cave, k + liquidFor + 1, emptyFor - liquidFor + lastSolid); } else { - getSurfaceDecorator().decorate(i, j, realX, realZ, output, cave, k, emptyFor); + getSurfaceDecorator().decorate(i, j, realX, realZ, output, cave, k, lastSolid); getCeilingDecorator().decorate(i, j, realX, realZ, output, cave, lastSolid - 1, emptyFor); } emptyFor = 0; diff --git a/src/main/java/com/volmit/iris/engine/decorator/IrisSeaFloorDecorator.java b/src/main/java/com/volmit/iris/engine/decorator/IrisSeaFloorDecorator.java index b0a45e309..6ddbb59f7 100644 --- a/src/main/java/com/volmit/iris/engine/decorator/IrisSeaFloorDecorator.java +++ b/src/main/java/com/volmit/iris/engine/decorator/IrisSeaFloorDecorator.java @@ -44,7 +44,7 @@ public class IrisSeaFloorDecorator extends IrisEngineDecorator { } } else { int stack = decorator.getHeight(getRng().nextParallelRNG(Cache.key(realX, realZ)), realX, realZ, getData()); - stack = Math.min(stack, max - height + 1); + stack = Math.min(stack, max - height + 2); BlockData top = decorator.getBlockDataForTop(biome, getRng(), realX, realZ, getData()); BlockData fill = decorator.getBlockData100(biome, getRng(), realX, realZ, getData()); diff --git a/src/main/java/com/volmit/iris/engine/decorator/IrisShoreLineDecorator.java b/src/main/java/com/volmit/iris/engine/decorator/IrisShoreLineDecorator.java index 768e89c87..e54aeb1c3 100644 --- a/src/main/java/com/volmit/iris/engine/decorator/IrisShoreLineDecorator.java +++ b/src/main/java/com/volmit/iris/engine/decorator/IrisShoreLineDecorator.java @@ -49,7 +49,7 @@ public class IrisShoreLineDecorator extends IrisEngineDecorator { data.set(x, height + 1, z, decorator.getBlockData100(biome, getRng(), realX, realZ, getData())); } else { int stack = decorator.getHeight(getRng().nextParallelRNG(Cache.key(realX, realZ)), realX, realZ, getData()); - stack = Math.min(max - height + 1, stack); + stack = Math.min(max - height, stack); BlockData top = decorator.getBlockDataForTop(biome, getRng(), realX, realZ, getData()); BlockData fill = decorator.getBlockData100(biome, getRng(), realX, realZ, getData()); diff --git a/src/main/java/com/volmit/iris/engine/decorator/IrisSurfaceDecorator.java b/src/main/java/com/volmit/iris/engine/decorator/IrisSurfaceDecorator.java index e6d10a507..04e4bfe8a 100644 --- a/src/main/java/com/volmit/iris/engine/decorator/IrisSurfaceDecorator.java +++ b/src/main/java/com/volmit/iris/engine/decorator/IrisSurfaceDecorator.java @@ -77,7 +77,7 @@ public class IrisSurfaceDecorator extends IrisEngineDecorator { } int stack = decorator.getHeight(getRng().nextParallelRNG(Cache.key(realX, realZ)), realX, realZ, getData()); - stack = Math.min(height - max + 1, stack); + stack = Math.min(height - max, stack); BlockData top = decorator.getBlockDataForTop(biome, getRng(), realX, realZ, getData()); BlockData fill = decorator.getBlockData100(biome, getRng(), realX, realZ, getData()); diff --git a/src/main/java/com/volmit/iris/engine/object/IrisCaveBiome.java b/src/main/java/com/volmit/iris/engine/object/IrisCaveBiome.java new file mode 100644 index 000000000..79427e68a --- /dev/null +++ b/src/main/java/com/volmit/iris/engine/object/IrisCaveBiome.java @@ -0,0 +1,86 @@ +/* + * 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.IrisDataManager; +import com.volmit.iris.core.gui.components.RenderType; +import com.volmit.iris.engine.IrisComplex; +import com.volmit.iris.engine.cache.AtomicCache; +import com.volmit.iris.engine.data.B; +import com.volmit.iris.engine.data.DataProvider; +import com.volmit.iris.engine.framework.Engine; +import com.volmit.iris.engine.framework.IrisAccess; +import com.volmit.iris.engine.noise.CNG; +import com.volmit.iris.engine.object.annotations.ArrayType; +import com.volmit.iris.engine.object.annotations.DependsOn; +import com.volmit.iris.engine.object.annotations.Desc; +import com.volmit.iris.engine.object.annotations.MaxNumber; +import com.volmit.iris.engine.object.annotations.MinNumber; +import com.volmit.iris.engine.object.annotations.RegistryListBiome; +import com.volmit.iris.engine.object.annotations.Required; +import com.volmit.iris.engine.object.common.IRare; +import com.volmit.iris.util.collection.KList; +import com.volmit.iris.util.collection.KMap; +import com.volmit.iris.util.collection.KSet; +import com.volmit.iris.util.data.VanillaBiomeMap; +import com.volmit.iris.util.inventorygui.RandomColor; +import com.volmit.iris.util.math.RNG; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.Accessors; +import org.bukkit.block.Biome; +import org.bukkit.block.data.BlockData; + +import java.awt.*; + +@SuppressWarnings("DefaultAnnotationParam") +@Accessors(chain = true) +@NoArgsConstructor +@AllArgsConstructor + +@Desc("Represents a cave biome in iris. Cave biomes are placed inside of caves and hold objects.\nA biome consists of layers (block palletes), decorations, objects & generators.") +@Data +@EqualsAndHashCode(callSuper = true) +public class IrisCaveBiome extends IrisBiome { + + @Required + @ArrayType(min = 1, type = IrisBiomePaletteLayer.class) + @Desc("This defines the layers of materials in this biome. Each layer has a palette and min/max height and some other properties. Usually a grassy/sandy layer then a dirt layer then a stone layer. Iris will fill in the remaining blocks below your layers with stone.") + private KList lavaLayers = new KList().qadd(new IrisBiomePaletteLayer()); + + @Required + @ArrayType(min = 1, type = IrisBiomePaletteLayer.class) + @Desc("This defines the layers of materials in this biome. Each layer has a palette and min/max height and some other properties. Usually a grassy/sandy layer then a dirt layer then a stone layer. Iris will fill in the remaining blocks below your layers with stone.") + private KList waterLayers = new KList().qadd(new IrisBiomePaletteLayer()); + + + public KList getLavaLayers() { + return lavaLayers.isEmpty() ? getLayers() : lavaLayers; + } + + public KList getWaterLayers() { + return waterLayers.isEmpty() ? getLayers() : waterLayers; + } + + public boolean freezeLava = false; + public boolean freezeWater = false; +}