diff --git a/core/src/main/java/com/volmit/iris/engine/actuator/IrisTerrainNormalActuator.java b/core/src/main/java/com/volmit/iris/engine/actuator/IrisTerrainNormalActuator.java index 93e5d8854..3af2addf4 100644 --- a/core/src/main/java/com/volmit/iris/engine/actuator/IrisTerrainNormalActuator.java +++ b/core/src/main/java/com/volmit/iris/engine/actuator/IrisTerrainNormalActuator.java @@ -31,8 +31,10 @@ import com.volmit.iris.util.scheduling.PrecisionStopwatch; import lombok.Getter; import org.bukkit.Chunk; import org.bukkit.Material; +import org.bukkit.World; import org.bukkit.block.Block; import org.bukkit.block.data.BlockData; +import org.bukkit.generator.ChunkGenerator; public class IrisTerrainNormalActuator extends EngineAssignedActuator { private static final BlockData AIR = Material.AIR.createBlockData(); @@ -174,9 +176,6 @@ public class IrisTerrainNormalActuator extends EngineAssignedActuator for (zf = 0; zf < h.getDepth(); zf++) { - - - } } } diff --git a/core/src/main/java/com/volmit/iris/engine/object/IrisMergeStrategies.java b/core/src/main/java/com/volmit/iris/engine/object/IrisMergeStrategies.java new file mode 100644 index 000000000..099a0fcc2 --- /dev/null +++ b/core/src/main/java/com/volmit/iris/engine/object/IrisMergeStrategies.java @@ -0,0 +1,20 @@ +package com.volmit.iris.engine.object; + + +import com.volmit.iris.engine.framework.Engine; +import com.volmit.iris.engine.object.annotations.Desc; +import com.volmit.iris.util.stream.ProceduralStream; + +import java.util.function.Function; + +@Desc("Modes for generator merging") +public enum IrisMergeStrategies { + @Desc("Splits the world in height. Use the split settings to customize this option") + SPLIT, + + @Desc("Split from of the engine height") + SPLIT_ENGINE_HEIGHT, + + @Desc("Merge from of the engine height") + MERGE_ENGINE_HEIGHT, +} diff --git a/core/src/main/java/com/volmit/iris/engine/object/IrisMerger.java b/core/src/main/java/com/volmit/iris/engine/object/IrisMerger.java new file mode 100644 index 000000000..e944bc457 --- /dev/null +++ b/core/src/main/java/com/volmit/iris/engine/object/IrisMerger.java @@ -0,0 +1,27 @@ +package com.volmit.iris.engine.object; + +import com.volmit.iris.engine.object.annotations.ArrayType; +import com.volmit.iris.engine.object.annotations.Desc; +import com.volmit.iris.engine.platform.BukkitChunkGenerator; +import com.volmit.iris.util.collection.KList; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.Accessors; +import org.bukkit.World; + +@AllArgsConstructor +@NoArgsConstructor +@Desc("Dimension Merging only supports 1 for now.") +@Data +public class IrisMerger { + @Desc("Selected Generator") + private String generator; + + @Desc("Merging strategy") + private IrisMergeStrategies mode; + + + +}