mirrors/Iris
1
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2026-04-02 22:06:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

implement static placements for structures and objects

Browse Source
This commit is contained in:
Julian Krings
2025-01-06 01:48:11 +01:00
parent fa7b0f68ff
commit 9a81905fdd
10 changed files with 243 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
core/src/main/java/com/volmit/iris/engine/IrisEngineMantle.java
View File

@@ -23,15 +23,11 @@ import com.volmit.iris.engine.data.cache.AtomicCache;
import com.volmit.iris.engine.framework.Engine;
import com.volmit.iris.engine.mantle.EngineMantle;
import com.volmit.iris.engine.mantle.MantleComponent;
import com.volmit.iris.engine.mantle.components.MantleCarvingComponent;
import com.volmit.iris.engine.mantle.components.MantleFluidBodyComponent;
import com.volmit.iris.engine.mantle.components.MantleJigsawComponent;
import com.volmit.iris.engine.mantle.components.MantleObjectComponent;
import com.volmit.iris.engine.mantle.components.*;
import com.volmit.iris.engine.object.*;
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.format.C;
import com.volmit.iris.util.format.Form;
import com.volmit.iris.util.mantle.Mantle;
import com.volmit.iris.util.parallel.BurstExecutor;
@@ -68,6 +64,7 @@ public class IrisEngineMantle implements EngineMantle {
registerComponent(jigsaw);
object = new MantleObjectComponent(this);
registerComponent(object);
registerComponent(new MantleStaticComponent(this));
}
@Override
@@ -165,6 +162,22 @@ public class IrisEngineMantle implements EngineMantle {
jig = Math.max(jig, getData().getJigsawStructureLoader().load(j.getStructure()).getMaxDimension());
}
jig = Math.max(getEngine().getDimension().getStaticPlacements().getStructures().stream()
.mapToInt(p -> p.maxDimension(getData()))
.max()
.orElse(0), jig);
getEngine().getDimension().getStaticPlacements().getObjects()
.stream()
.map(IrisStaticObjectPlacement::placement)
.forEach(j -> {
if (j.getScale().canScaleBeyond()) {
scalars.put(j.getScale(), j.getPlace());
} else {
objects.addAll(j.getPlace());
}
});
if (getEngine().getDimension().getStronghold() != null) {
try {
jig = Math.max(jig, getData().getJigsawStructureLoader().load(getEngine().getDimension().getStronghold()).getMaxDimension());

7
core/src/main/java/com/volmit/iris/engine/framework/Engine.java
View File

@@ -826,6 +826,13 @@ public interface Engine extends DataProvider, Fallible, LootProvider, BlockUpdat
return new PlacedObject(piece.getPlacementOptions(), getData().getObjectLoader().load(object), id, x, z);
}
for (var staticPlacement : getDimension().getStaticPlacements().getObjects()) {
IrisObjectPlacement i = staticPlacement.placement();
if (i.getPlace().contains(object)) {
return new PlacedObject(i, getData().getObjectLoader().load(object), id, x, z);
}
}
IrisRegion region = getRegion(x, z);
for (IrisObjectPlacement i : region.getObjects()) {

28
core/src/main/java/com/volmit/iris/engine/mantle/components/MantleStaticComponent.java Normal file
View File

@@ -0,0 +1,28 @@
package com.volmit.iris.engine.mantle.components;
import com.volmit.iris.engine.mantle.EngineMantle;
import com.volmit.iris.engine.mantle.IrisMantleComponent;
import com.volmit.iris.engine.mantle.MantleWriter;
import com.volmit.iris.engine.object.IrisStaticPlacement;
import com.volmit.iris.engine.object.NoiseStyle;
import com.volmit.iris.util.context.ChunkContext;
import com.volmit.iris.util.mantle.MantleFlag;
import com.volmit.iris.util.math.RNG;
import com.volmit.iris.util.noise.CNG;
public class MantleStaticComponent extends IrisMantleComponent {
private final CNG cng;
public MantleStaticComponent(EngineMantle engineMantle) {
super(engineMantle, MantleFlag.STATIC);
cng = NoiseStyle.STATIC.create(new RNG(seed()));
}
@Override
public void generateLayer(MantleWriter writer, int x, int z, ChunkContext context) {
RNG rng = new RNG(cng.fit(Integer.MIN_VALUE, Integer.MAX_VALUE, x, z));
for (IrisStaticPlacement placement : getDimension().getStaticPlacements().getAll(x, z)) {
placement.place(writer, rng, getData());
}
}
}

2
core/src/main/java/com/volmit/iris/engine/object/IrisDimension.java
View File

@@ -310,6 +310,8 @@ public class IrisDimension extends IrisRegistrant {
@MaxNumber(318)
@Desc("The Subterrain Fluid Layer Height")
private int caveLavaHeight = 8;
@Desc("Static Placements for objects and structures")
private IrisStaticPlacements staticPlacements = new IrisStaticPlacements();
public int getMaxHeight() {
return (int) getDimensionHeight().getMax();

52
core/src/main/java/com/volmit/iris/engine/object/IrisStaticObjectPlacement.java Normal file
View File

@@ -0,0 +1,52 @@
package com.volmit.iris.engine.object;
import com.volmit.iris.core.loader.IrisData;
import com.volmit.iris.engine.mantle.MantleWriter;
import com.volmit.iris.engine.object.annotations.Desc;
import com.volmit.iris.engine.object.annotations.Required;
import com.volmit.iris.util.data.B;
import com.volmit.iris.util.data.IrisBlockData;
import com.volmit.iris.util.math.RNG;
import com.volmit.iris.util.matter.MatterStructurePOI;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
@Data
@Desc("Static Object Placement")
@Accessors(chain = true, fluent = true)
@NoArgsConstructor
@AllArgsConstructor
public class IrisStaticObjectPlacement implements IrisStaticPlacement {
@Required
@Desc("The X coordinate to spawn the object at")
private int x = 0;
@Required
@Desc("The Y coordinate to spawn the object at\nuse a value <0 to allow the placement modes to function")
private int y = 0;
@Required
@Desc("The Z coordinate to spawn the object at")
private int z = 0;
@Required
@Desc("The object placement to use")
private IrisObjectPlacement placement;
@Override
public void place(MantleWriter writer, RNG rng, IrisData irisData) {
IrisObject v = placement.getScale().get(rng, placement.getObject(() -> irisData, rng));
if (v == null) return;
v.place(x, y, z, writer, placement, rng, irisData);
int id = rng.i(0, Integer.MAX_VALUE);
v.place(x, y, z, writer, placement, rng, (b, data) -> {
writer.setData(b.getX(), b.getY(), b.getZ(), v.getLoadKey() + "@" + id);
if (placement.isDolphinTarget() && placement.isUnderwater() && B.isStorageChest(data)) {
writer.setData(b.getX(), b.getY(), b.getZ(), MatterStructurePOI.BURIED_TREASURE);
}
if (data instanceof IrisBlockData d) {
writer.setData(b.getX(), b.getY(), b.getZ(), d.getCustom());
}
}, null, irisData);
}
}

19
core/src/main/java/com/volmit/iris/engine/object/IrisStaticPlacement.java Normal file
View File

@@ -0,0 +1,19 @@
package com.volmit.iris.engine.object;
import com.volmit.iris.core.loader.IrisData;
import com.volmit.iris.engine.mantle.MantleWriter;
import com.volmit.iris.util.documentation.ChunkCoordinates;
import com.volmit.iris.util.math.RNG;
public interface IrisStaticPlacement {
int x();
int y();
int z();
@ChunkCoordinates
default boolean shouldPlace(int chunkX, int chunkZ) {
return x() >> 4 == chunkX && z() >> 4 == chunkZ;
}
void place(MantleWriter writer, RNG rng, IrisData data);
}

49
core/src/main/java/com/volmit/iris/engine/object/IrisStaticPlacements.java Normal file
View File

@@ -0,0 +1,49 @@
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.util.collection.KList;
import com.volmit.iris.util.documentation.ChunkCoordinates;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@Accessors(chain = true)
@NoArgsConstructor
@AllArgsConstructor
@Desc("Static Placements")
@Data
public class IrisStaticPlacements {
@Desc("List of static jigsaw structures")
@ArrayType(type = IrisStaticStructurePlacement.class)
private KList<IrisStaticStructurePlacement> structures = new KList<>();
@Desc("List of static objects")
@ArrayType(type = IrisStaticObjectPlacement.class)
private KList<IrisStaticObjectPlacement> objects = new KList<>();
@ChunkCoordinates
public KList<IrisStaticStructurePlacement> getStructures(int chunkX, int chunkZ) {
return filter(structures.stream(), chunkX, chunkZ);
}
@ChunkCoordinates
public KList<IrisStaticObjectPlacement> getObjects(int chunkX, int chunkZ) {
return filter(objects.stream(), chunkX, chunkZ);
}
@ChunkCoordinates
public KList<IrisStaticPlacement> getAll(int chunkX, int chunkZ) {
return filter(Stream.concat(structures.stream(), objects.stream()), chunkX, chunkZ);
}
private <T extends IrisStaticPlacement> KList<T> filter(Stream<T> stream, int chunkX, int chunkZ) {
return stream.filter(p -> p.shouldPlace(chunkX, chunkZ))
.collect(Collectors.toCollection(KList::new));
}
}

65
core/src/main/java/com/volmit/iris/engine/object/IrisStaticStructurePlacement.java Normal file
View File

@@ -0,0 +1,65 @@
package com.volmit.iris.engine.object;
import com.volmit.iris.Iris;
import com.volmit.iris.core.loader.IrisData;
import com.volmit.iris.engine.jigsaw.PlannedStructure;
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.RegistryListResource;
import com.volmit.iris.engine.object.annotations.Required;
import com.volmit.iris.util.collection.KList;
import com.volmit.iris.util.math.RNG;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
@Data
@Desc("Static Jigsaw Structure Placement")
@Accessors(chain = true, fluent = true)
@NoArgsConstructor
@AllArgsConstructor
public class IrisStaticStructurePlacement implements IrisStaticPlacement {
@Required
@Desc("The X coordinate to spawn the structure at")
private int x = 0;
@Required
@Desc("The Y coordinate to spawn the structure at")
private int y = 0;
@Required
@Desc("The Z coordinate to spawn the structure at")
private int z = 0;
@Required
@ArrayType(min = 1, type = String.class)
@RegistryListResource(IrisJigsawStructure.class)
@Desc("The structures to place")
private KList<String> structures;
public int maxDimension(IrisData data) {
return data.getJigsawStructureLoader().loadAll(structures)
.stream()
.mapToInt(IrisJigsawStructure::getMaxDimension)
.max()
.orElse(0);
}
@Override
public void place(MantleWriter writer, RNG rng, IrisData data) {
IrisJigsawStructure jigsaw = null;
while (jigsaw == null && !structures.isEmpty()) {
String loadKey = structures.popRandom(rng);
jigsaw = data.getJigsawStructureLoader().load(loadKey);
if (jigsaw == null)
Iris.error("Jigsaw structure not found " + loadKey);
}
if (jigsaw == null) {
Iris.error("No jigsaw structure found for " + structures);
return;
}
new PlannedStructure(jigsaw, new IrisPosition(x, y, z), rng, false)
.place(writer, writer.getMantle(), writer.getEngine());
}
}

2
core/src/main/java/com/volmit/iris/util/collection/KList.java
View File

@@ -487,7 +487,7 @@ public class KList<T> extends ArrayList<T> implements List<T> {
return pop();
}
return remove(rng.i(0, last()));
return remove(rng.i(0, size()));
}
public KList<T> sub(int f, int t) {

3
core/src/main/java/com/volmit/iris/util/mantle/MantleFlag.java
View File

@@ -35,7 +35,8 @@ public enum MantleFlag {
ETCHED,
TILE,
CUSTOM,
DISCOVERED;
DISCOVERED,
STATIC;
static StateList getStateList() {
return new StateList(MantleFlag.values());