Merged object bake

- Baked rotated object variants, packed transactions, non-blocking source plan builds
This commit is contained in:
Brian Neumann-Fopiano committed 2026-10-22 02:49:58 -04:00
commit 544707f5d6
16 files changed
+2096 -559

No files matched your search

@@ -30,27 +30,41 @@ import art.arcane.iris.generation.hydrology.cave.HydrologyCaveCell;
import art.arcane.volmlib.nativelib.terrain.NativeBlockState; import art.arcane.volmlib.nativelib.terrain.NativeBlockState;
import art.arcane.volmlib.util.math.BlockPosition; import art.arcane.volmlib.util.math.BlockPosition;
import art.arcane.iris.generation.block.B; import art.arcane.iris.generation.block.B;
import art.arcane.volmlib.util.collection.KList;
import it.unimi.dsi.fastutil.longs.Long2IntOpenHashMap; import it.unimi.dsi.fastutil.longs.Long2IntOpenHashMap;
import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import java.util.HashMap; import java.util.Arrays;
import java.util.Map;
final class CaveObjectPlacementTransaction implements IObjectPlacer { final class CaveObjectPlacementTransaction implements IObjectPlacer {
private static final int CACHE_MISS = Integer.MIN_VALUE; private static final int CACHE_MISS = Integer.MIN_VALUE;
private static final int POSITION_BITS = 21;
private static final int POSITION_LIMIT = 1 << (POSITION_BITS - 1);
private static final long POSITION_MASK = (1L << POSITION_BITS) - 1L;
private final IObjectPlacer delegate; private final IObjectPlacer delegate;
private final Engine engine; private final Engine engine;
private final int anchorY; private final int anchorY;
private final int minDepthBelowSurface; private final int minDepthBelowSurface;
private final int worldHeight; private final int worldHeight;
private final KList<BufferedMutation> mutations; private static final byte BLOCK = 0;
private final Map<PositionKey, NativeBlockState> bufferedBlocks; private static final byte TILE = 1;
private static final byte DATA = 2;
private int[] mutationX = new int[64];
private int[] mutationY = new int[64];
private int[] mutationZ = new int[64];
private Object[] mutationValues = new Object[64];
private byte[] mutationKinds = new byte[64];
private boolean[] mutationCanopies = new boolean[64];
private int mutationCount;
private final Long2ObjectOpenHashMap<NativeBlockState> bufferedBlocks;
private final Long2IntOpenHashMap surfaceHeights; private final Long2IntOpenHashMap surfaceHeights;
private final Long2IntOpenHashMap caveCeilings; private final Long2IntOpenHashMap caveCeilings;
private int blockWrites; private int blockWrites;
private BlockPosition canopyPosition; private BlockPosition canopyPosition;
private boolean originKnown;
private int originX;
private int originZ;
CaveObjectPlacementTransaction(IObjectPlacer delegate, int anchorY, int minDepthBelowSurface) { CaveObjectPlacementTransaction(IObjectPlacer delegate, int anchorY, int minDepthBelowSurface) {
this.delegate = delegate; this.delegate = delegate;
@@ -58,8 +72,7 @@ final class CaveObjectPlacementTransaction implements IObjectPlacer {
this.anchorY = anchorY; this.anchorY = anchorY;
this.minDepthBelowSurface = Math.max(0, minDepthBelowSurface); this.minDepthBelowSurface = Math.max(0, minDepthBelowSurface);
this.worldHeight = engine == null ? 0 : engine.getHeight(); this.worldHeight = engine == null ? 0 : engine.getHeight();
this.mutations = new KList<>(); this.bufferedBlocks = new Long2ObjectOpenHashMap<>();
this.bufferedBlocks = new HashMap<>();
this.surfaceHeights = new Long2IntOpenHashMap(); this.surfaceHeights = new Long2IntOpenHashMap();
this.caveCeilings = new Long2IntOpenHashMap(); this.caveCeilings = new Long2IntOpenHashMap();
this.surfaceHeights.defaultReturnValue(CACHE_MISS); this.surfaceHeights.defaultReturnValue(CACHE_MISS);
@@ -73,28 +86,41 @@ final class CaveObjectPlacementTransaction implements IObjectPlacer {
} }
IrisComplex complex = engine == null ? null : engine.getComplex(); IrisComplex complex = engine == null ? null : engine.getComplex();
for (BufferedMutation mutation : mutations) { boolean previousChecked = false;
int previousX = 0;
int previousY = 0;
int previousZ = 0;
for (int index = 0; index < mutationCount; index++) {
int x = mutationX[index];
int y = mutationY[index];
int z = mutationZ[index];
if (previousChecked && x == previousX && y == previousY && z == previousZ) {
continue;
}
if (complex != null if (complex != null
&& !complex.allowsNewDiscreteContentAt(mutation.x(), mutation.z())) { && !complex.allowsNewDiscreteContentAt(x, z)) {
discard(); discard();
return CommitResult.REJECTED_TRANSITION; return CommitResult.REJECTED_TRANSITION;
} }
if (!isWithinBounds(mutation.x(), mutation.y(), mutation.z())) { if (!isWithinBounds(x, y, z)) {
discard(); discard();
return CommitResult.REJECTED_BOUNDS; return CommitResult.REJECTED_BOUNDS;
} }
SubterrainCell feature = engine.getSubterrainCell(mutation.x(), mutation.y(), mutation.z()); SubterrainCell feature = engine.getSubterrainCell(x, y, z);
if (SubterrainRasterizer.protectsPlacement(feature) if (SubterrainRasterizer.protectsPlacement(feature)
|| feature != null && feature.solid() && delegate.isSolid(mutation.x(), mutation.y(), mutation.z())) { || feature != null && feature.solid() && delegate.isSolid(x, y, z)) {
discard(); discard();
return CommitResult.REJECTED_SUBTERRAIN; return CommitResult.REJECTED_SUBTERRAIN;
} }
HydrologyCaveCell hydrology = delegate.getData( HydrologyCaveCell hydrology = delegate.getData(x, y, z, HydrologyCaveCell.class);
mutation.x(), mutation.y(), mutation.z(), HydrologyCaveCell.class);
if (hydrology != null && hydrology.protectsPlacement()) { if (hydrology != null && hydrology.protectsPlacement()) {
discard(); discard();
return CommitResult.REJECTED_HYDROLOGY; return CommitResult.REJECTED_HYDROLOGY;
} }
previousChecked = true;
previousX = x;
previousY = y;
previousZ = z;
} }
applyMutations(); applyMutations();
@@ -106,18 +132,26 @@ final class CaveObjectPlacementTransaction implements IObjectPlacer {
boolean canopyOpen = false; boolean canopyOpen = false;
boolean skipCanopy = false; boolean skipCanopy = false;
try { try {
for (BufferedMutation mutation : mutations) { for (int index = 0; index < mutationCount; index++) {
if (mutation.value() instanceof NativeBlockState) { int x = mutationX[index];
int y = mutationY[index];
int z = mutationZ[index];
Object value = mutationValues[index];
boolean canopy = mutationCanopies[index];
if (value instanceof NativeBlockState) {
if (canopyOpen) { if (canopyOpen) {
delegate.endTreeCanopy(); delegate.endTreeCanopy();
canopyOpen = false; canopyOpen = false;
} }
skipCanopy = mutation.canopy() skipCanopy = canopy && !delegate.beginTreeCanopy(new BlockPosition(x, y, z));
&& !delegate.beginTreeCanopy(new BlockPosition(mutation.x(), mutation.y(), mutation.z())); canopyOpen = canopy && !skipCanopy;
canopyOpen = mutation.canopy() && !skipCanopy;
} }
if (!mutation.canopy() || !skipCanopy) { if (!canopy || !skipCanopy) {
mutation.apply(delegate); switch (mutationKinds[index]) {
case BLOCK -> delegate.set(x, y, z, (NativeBlockState) value);
case TILE -> delegate.setTile(x, y, z, (TileData) value);
default -> delegate.setData(x, y, z, value);
}
} }
} }
} finally { } finally {
@@ -128,11 +162,31 @@ final class CaveObjectPlacementTransaction implements IObjectPlacer {
} }
void discard() { void discard() {
mutations.clear(); Arrays.fill(mutationValues, 0, mutationCount, null);
mutationCount = 0;
bufferedBlocks.clear(); bufferedBlocks.clear();
blockWrites = 0; blockWrites = 0;
} }
private void buffer(byte kind, int x, int y, int z, Object value) {
if (mutationCount == mutationValues.length) {
int capacity = mutationCount * 2;
mutationX = Arrays.copyOf(mutationX, capacity);
mutationY = Arrays.copyOf(mutationY, capacity);
mutationZ = Arrays.copyOf(mutationZ, capacity);
mutationValues = Arrays.copyOf(mutationValues, capacity);
mutationKinds = Arrays.copyOf(mutationKinds, capacity);
mutationCanopies = Arrays.copyOf(mutationCanopies, capacity);
}
mutationX[mutationCount] = x;
mutationY[mutationCount] = y;
mutationZ[mutationCount] = z;
mutationValues[mutationCount] = value;
mutationKinds[mutationCount] = kind;
mutationCanopies[mutationCount] = isCanopy(x, y, z);
mutationCount++;
}
int getCaveCeiling(int x, int z) { int getCaveCeiling(int x, int z) {
long key = Cache.key(x, z); long key = Cache.key(x, z);
int cached = caveCeilings.get(key); int cached = caveCeilings.get(key);
@@ -164,8 +218,8 @@ final class CaveObjectPlacementTransaction implements IObjectPlacer {
if (state == null) { if (state == null) {
return; return;
} }
mutations.add(new BlockMutation(x, y, z, state, isCanopy(x, y, z))); buffer(BLOCK, x, y, z, state);
bufferedBlocks.put(new PositionKey(x, y, z), state); bufferedBlocks.put(bufferKey(x, y, z), state);
blockWrites++; blockWrites++;
} }
@@ -190,7 +244,7 @@ final class CaveObjectPlacementTransaction implements IObjectPlacer {
@Override @Override
public NativeBlockState get(int x, int y, int z) { public NativeBlockState get(int x, int y, int z) {
NativeBlockState buffered = bufferedBlocks.get(new PositionKey(x, y, z)); NativeBlockState buffered = bufferedBlocks.isEmpty() ? null : bufferedBlocks.get(bufferKey(x, y, z));
return buffered == null ? delegate.get(x, y, z) : buffered; return buffered == null ? delegate.get(x, y, z) : buffered;
} }
@@ -211,7 +265,7 @@ final class CaveObjectPlacementTransaction implements IObjectPlacer {
@Override @Override
public boolean isSolid(int x, int y, int z) { public boolean isSolid(int x, int y, int z) {
NativeBlockState buffered = bufferedBlocks.get(new PositionKey(x, y, z)); NativeBlockState buffered = bufferedBlocks.isEmpty() ? null : bufferedBlocks.get(bufferKey(x, y, z));
return buffered == null ? delegate.isSolid(x, y, z) : B.isSolid(buffered); return buffered == null ? delegate.isSolid(x, y, z) : B.isSolid(buffered);
} }
@@ -242,7 +296,7 @@ final class CaveObjectPlacementTransaction implements IObjectPlacer {
@Override @Override
public void setTile(int x, int y, int z, TileData tile) { public void setTile(int x, int y, int z, TileData tile) {
if (tile != null) { if (tile != null) {
mutations.add(new TileMutation(x, y, z, tile, isCanopy(x, y, z))); buffer(TILE, x, y, z, tile);
} }
} }
@@ -251,21 +305,20 @@ final class CaveObjectPlacementTransaction implements IObjectPlacer {
if (data == null) { if (data == null) {
return; return;
} }
mutations.add(new DataMutation(x, y, z, data, isCanopy(x, y, z))); buffer(DATA, x, y, z, data);
if (data instanceof NativeBlockState state) { if (data instanceof NativeBlockState state) {
bufferedBlocks.put(new PositionKey(x, y, z), state); bufferedBlocks.put(bufferKey(x, y, z), state);
blockWrites++; blockWrites++;
} }
} }
@Override @Override
public <T> @Nullable T getData(int x, int y, int z, Class<T> type) { public <T> @Nullable T getData(int x, int y, int z, Class<T> type) {
for (int i = mutations.size() - 1; i >= 0; i--) { for (int index = mutationCount - 1; index >= 0; index--) {
BufferedMutation mutation = mutations.get(i); if (mutationX[index] != x || mutationY[index] != y || mutationZ[index] != z) {
if (mutation.x() != x || mutation.y() != y || mutation.z() != z) {
continue; continue;
} }
Object value = mutation.value(); Object value = mutationValues[index];
if (type.isInstance(value)) { if (type.isInstance(value)) {
return type.cast(value); return type.cast(value);
} }
@@ -278,6 +331,22 @@ final class CaveObjectPlacementTransaction implements IObjectPlacer {
return engine; return engine;
} }
private long bufferKey(int x, int y, int z) {
if (!originKnown) {
originX = x;
originZ = z;
originKnown = true;
}
int dx = x - originX;
int dz = z - originZ;
if (dx < -POSITION_LIMIT || dx >= POSITION_LIMIT || dz < -POSITION_LIMIT || dz >= POSITION_LIMIT
|| y < -POSITION_LIMIT || y >= POSITION_LIMIT) {
throw new IllegalStateException("Cave object write at " + x + "," + y + "," + z
+ " is too far from its first write at " + originX + "," + originZ);
}
return ((dx & POSITION_MASK) << (POSITION_BITS * 2)) | ((dz & POSITION_MASK) << POSITION_BITS) | (y & POSITION_MASK);
}
private boolean isWithinBounds(int x, int y, int z) { private boolean isWithinBounds(int x, int y, int z) {
if (engine == null || y < 0 || y >= worldHeight) { if (engine == null || y < 0 || y >= worldHeight) {
return false; return false;
@@ -325,42 +394,4 @@ final class CaveObjectPlacementTransaction implements IObjectPlacer {
REJECTED_HYDROLOGY, REJECTED_HYDROLOGY,
REJECTED_SUBTERRAIN REJECTED_SUBTERRAIN
} }
private interface BufferedMutation {
int x();
int y();
int z();
Object value();
boolean canopy();
void apply(IObjectPlacer placer);
}
private record BlockMutation(int x, int y, int z, NativeBlockState value, boolean canopy) implements BufferedMutation {
@Override
public void apply(IObjectPlacer placer) {
placer.set(x, y, z, value);
}
}
private record TileMutation(int x, int y, int z, TileData value, boolean canopy) implements BufferedMutation {
@Override
public void apply(IObjectPlacer placer) {
placer.setTile(x, y, z, value);
}
}
private record DataMutation(int x, int y, int z, Object value, boolean canopy) implements BufferedMutation {
@Override
public void apply(IObjectPlacer placer) {
placer.setData(x, y, z, value);
}
}
private record PositionKey(int x, int y, int z) {
}
} }
@@ -88,6 +88,8 @@ public class MantleObjectComponent extends IrisMantleComponent {
private static final Map<String, CaveRejectLogState> CAVE_REJECT_LOG_STATE = new ConcurrentHashMap<>(); private static final Map<String, CaveRejectLogState> CAVE_REJECT_LOG_STATE = new ConcurrentHashMap<>();
private static final Set<String> MISSING_LOAD_KEY_WARNED = ConcurrentHashMap.newKeySet(); private static final Set<String> MISSING_LOAD_KEY_WARNED = ConcurrentHashMap.newKeySet();
private static final long SOURCE_PLAN_STATS_INTERVAL_MS = 30_000L; private static final long SOURCE_PLAN_STATS_INTERVAL_MS = 30_000L;
private static final int MAXIMUM_TREE_MATERIALS = 8192;
private static final Map<NativeBlockState, TreeBlockMaterial> TREE_MATERIALS = new ConcurrentHashMap<>();
private final Object collisionRuleLock; private final Object collisionRuleLock;
private final ObjectSourcePlanCache sourcePlans; private final ObjectSourcePlanCache sourcePlans;
@@ -124,7 +126,14 @@ public class MantleObjectComponent extends IrisMantleComponent {
} }
private static void writeTreeMaterial(IObjectPlacer placer, int x, int y, int z, NativeBlockState data) { private static void writeTreeMaterial(IObjectPlacer placer, int x, int y, int z, NativeBlockState data) {
placer.setData(x, y, z, TreeBlockMaterial.of(data)); TreeBlockMaterial material = TREE_MATERIALS.get(data);
if (material == null) {
material = TreeBlockMaterial.of(data);
if (TREE_MATERIALS.size() < MAXIMUM_TREE_MATERIALS) {
TREE_MATERIALS.putIfAbsent(data, material);
}
}
placer.setData(x, y, z, material);
} }
@Override @Override
@@ -157,19 +166,23 @@ public class MantleObjectComponent extends IrisMantleComponent {
ObjectDestinationTransaction transaction = new ObjectDestinationTransaction(writer, x, z); ObjectDestinationTransaction transaction = new ObjectDestinationTransaction(writer, x, z);
int radius = getRadius(); int radius = getRadius();
int sourceChunkRadius = sourceChunkRadius(radius); int sourceChunkRadius = sourceChunkRadius(radius);
replaySourceChunks( int side = (sourceChunkRadius * 2) + 1;
x, ObjectSourcePlan[] plans = new ObjectSourcePlan[side * side];
z, int[] slot = new int[1];
radius, replaySourceChunks(x, z, radius, (sourceX, sourceZ) -> plans[slot[0]++] = sourcePlans.tryAcquire(
(sourceX, sourceZ) -> { sourceX, sourceZ, x, z, sourceChunkRadius, () -> buildSourcePlan(writer, sourceX, sourceZ, context)));
ObjectSourcePlan plan = sourcePlans.acquire(sourceX, sourceZ, x, z, sourceChunkRadius, slot[0] = 0;
() -> buildSourcePlan(writer, sourceX, sourceZ, context)); replaySourceChunks(x, z, radius, (sourceX, sourceZ) -> {
if (plan != null) { ObjectSourcePlan plan = plans[slot[0]++];
transaction.apply(plan); if (plan == ObjectSourcePlanCache.BUSY) {
plan.persistContinuations(writer, sourceX, sourceZ, x, z); plan = sourcePlans.acquire(sourceX, sourceZ, x, z, sourceChunkRadius,
} () -> buildSourcePlan(writer, sourceX, sourceZ, context));
} }
); if (plan != null) {
transaction.apply(plan);
plan.persistContinuations(writer, sourceX, sourceZ, x, z);
}
});
transaction.commit(); transaction.commit();
logSourcePlanStats(); logSourcePlanStats();
} }
@@ -244,7 +244,7 @@ public class MantleWriter implements ObjectPassPlacer, AutoCloseable {
synchronized (chunk) { synchronized (chunk) {
Matter matter = chunk.getOrCreate(y >> 4); Matter matter = chunk.getOrCreate(y >> 4);
if ((t instanceof NativeBlockState || t instanceof MatterCavern) if ((t instanceof NativeBlockState || t instanceof MatterCavern)
&& (hasProtectedHydrology(matter, x, y, z) || protectsSubterrainPlacement(x, y, z))) { && hasProtectedHydrology(matter, x, y, z)) {
return; return;
} }
if (t instanceof NativeBlockState) { if (t instanceof NativeBlockState) {
@@ -0,0 +1,89 @@
package art.arcane.iris.generation.mantle;
import art.arcane.volmlib.nativelib.terrain.NativeBlockState;
import java.util.Arrays;
import java.util.List;
import java.util.Objects;
final class MutationLog {
private static final byte CUSTOM = 1;
private static final byte CANOPY = 2;
private int size;
private int[] x = new int[32];
private int[] y = new int[32];
private int[] z = new int[32];
private Object[] values = new Object[32];
private byte[] flags = new byte[32];
static MutationLog of(List<ObjectDestinationTransaction.Mutation> mutations) {
MutationLog log = new MutationLog();
for (ObjectDestinationTransaction.Mutation mutation : mutations) {
Objects.requireNonNull(mutation, "mutation");
ObjectDestinationTransaction.DataKey key = mutation.key();
switch (mutation) {
case ObjectDestinationTransaction.SetMutation set -> {
Object value = Objects.requireNonNull(set.value(), "mutation value");
if (ObjectSourcePlan.typeOf(value) != key.type()) {
throw new IllegalArgumentException("Object mutation type " + key.type().getName()
+ " does not match its value " + value.getClass().getName());
}
log.add(key.x(), key.y(), key.z(), value, false, set.canopy());
}
case ObjectDestinationTransaction.CustomBlockMutation block -> log.add(key.x(), key.y(), key.z(),
Objects.requireNonNull(block.state(), "custom block state"), true, block.canopy());
}
}
return log;
}
void add(int blockX, int blockY, int blockZ, Object value, boolean custom, boolean canopy) {
if (size == values.length) {
int capacity = size * 2;
x = Arrays.copyOf(x, capacity);
y = Arrays.copyOf(y, capacity);
z = Arrays.copyOf(z, capacity);
values = Arrays.copyOf(values, capacity);
flags = Arrays.copyOf(flags, capacity);
}
x[size] = blockX;
y[size] = blockY;
z[size] = blockZ;
values[size] = value;
flags[size] = (byte) ((custom ? CUSTOM : 0) | (canopy ? CANOPY : 0));
size++;
}
int size() {
return size;
}
int x(int index) {
return x[index];
}
int y(int index) {
return y[index];
}
int z(int index) {
return z[index];
}
Object value(int index) {
return values[index];
}
boolean custom(int index) {
return (flags[index] & CUSTOM) != 0;
}
boolean canopy(int index) {
return (flags[index] & CANOPY) != 0;
}
Class<?> type(int index) {
return custom(index) ? NativeBlockState.class : ObjectSourcePlan.typeOf(values[index]);
}
}
@@ -8,7 +8,6 @@ import art.arcane.iris.generation.decoration.tree.TreeBlockMaterial;
import art.arcane.iris.generation.hydrology.cave.HydrologyCaveCell; import art.arcane.iris.generation.hydrology.cave.HydrologyCaveCell;
import art.arcane.iris.generation.subterrain.SubterrainRasterizer; import art.arcane.iris.generation.subterrain.SubterrainRasterizer;
import art.arcane.iris.generation.block.TileData; import art.arcane.iris.generation.block.TileData;
import art.arcane.iris.structure.object.IObjectPlacer;
import art.arcane.volmlib.nativelib.terrain.NativeBlockState; import art.arcane.volmlib.nativelib.terrain.NativeBlockState;
import art.arcane.volmlib.util.math.BlockPosition; import art.arcane.volmlib.util.math.BlockPosition;
import art.arcane.iris.generation.block.B; import art.arcane.iris.generation.block.B;
@@ -18,10 +17,11 @@ import org.jetbrains.annotations.Nullable;
import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap; import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap;
import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
import it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@@ -32,7 +32,7 @@ final class ObjectDestinationTransaction implements ObjectPassPlacer {
private final int destinationChunkX; private final int destinationChunkX;
private final int destinationChunkZ; private final int destinationChunkZ;
private final int worldHeight; private final int worldHeight;
private final List<Mutation> mutations; private final MutationLog log = new MutationLog();
private final List<PlacementRange> placements = new ArrayList<>(); private final List<PlacementRange> placements = new ArrayList<>();
private final Long2ObjectOpenHashMap<Int2ObjectOpenHashMap<OverlayCell>> overlay; private final Long2ObjectOpenHashMap<Int2ObjectOpenHashMap<OverlayCell>> overlay;
private BlockPosition canopyPosition; private BlockPosition canopyPosition;
@@ -40,13 +40,17 @@ final class ObjectDestinationTransaction implements ObjectPassPlacer {
private int hydrologyGateChunkX; private int hydrologyGateChunkX;
private int hydrologyGateChunkZ; private int hydrologyGateChunkZ;
private boolean hydrologyGateOpen; private boolean hydrologyGateOpen;
private boolean subterrainKnown;
private int subterrainX;
private int subterrainY;
private int subterrainZ;
private boolean subterrainProtects;
ObjectDestinationTransaction(MantleWriter writer, int destinationChunkX, int destinationChunkZ) { ObjectDestinationTransaction(MantleWriter writer, int destinationChunkX, int destinationChunkZ) {
this.writer = writer; this.writer = writer;
this.destinationChunkX = destinationChunkX; this.destinationChunkX = destinationChunkX;
this.destinationChunkZ = destinationChunkZ; this.destinationChunkZ = destinationChunkZ;
this.worldHeight = writer.getMantle().getWorldHeight(); this.worldHeight = writer.getMantle().getWorldHeight();
this.mutations = new ArrayList<>();
this.overlay = new Long2ObjectOpenHashMap<>(); this.overlay = new Long2ObjectOpenHashMap<>();
} }
@@ -55,11 +59,11 @@ final class ObjectDestinationTransaction implements ObjectPassPlacer {
} }
int mutationCheckpoint() { int mutationCheckpoint() {
return mutations.size(); return log.size();
} }
ObjectSourcePlan sourcePlanSince(int checkpoint) { ObjectSourcePlan sourcePlanSince(int checkpoint) {
if (checkpoint < 0 || checkpoint > mutations.size()) { if (checkpoint < 0 || checkpoint > log.size()) {
throw new IllegalArgumentException("Mutation checkpoint is outside the transaction"); throw new IllegalArgumentException("Mutation checkpoint is outside the transaction");
} }
ArrayList<PlacementRange> accepted = new ArrayList<>(); ArrayList<PlacementRange> accepted = new ArrayList<>();
@@ -68,65 +72,91 @@ final class ObjectDestinationTransaction implements ObjectPassPlacer {
accepted.add(new PlacementRange(placement.start() - checkpoint, placement.end() - checkpoint)); accepted.add(new PlacementRange(placement.start() - checkpoint, placement.end() - checkpoint));
} }
} }
return new ObjectSourcePlan(mutations.subList(checkpoint, mutations.size()), accepted); return new ObjectSourcePlan(log, checkpoint, accepted);
} }
@Override @Override
public int beginObjectPlacement() { public int beginObjectPlacement() {
return mutations.size(); return log.size();
} }
@Override @Override
public void endObjectPlacement(int checkpoint) { public void endObjectPlacement(int checkpoint) {
if (checkpoint >= 0 && checkpoint < mutations.size()) { if (checkpoint >= 0 && checkpoint < log.size()) {
placements.add(new PlacementRange(checkpoint, mutations.size())); placements.add(new PlacementRange(checkpoint, log.size()));
} }
} }
void apply(ObjectSourcePlan plan) { void apply(ObjectSourcePlan plan) {
int slot = plan.destinationSlot(destinationChunkX, destinationChunkZ);
if (slot < 0) {
return;
}
int baseX = destinationChunkX << 4;
int baseZ = destinationChunkZ << 4;
boolean skipCanopy = false; boolean skipCanopy = false;
for (Mutation mutation : plan.mutationsFor(destinationChunkX, destinationChunkZ)) { int end = plan.slotEnd(slot);
if (mutation.key().type() == NativeBlockState.class) { for (int index = plan.slotStart(slot); index < end; index++) {
NativeBlockState existing = mutation.canopy() ? get(mutation.key().x(), mutation.key().y(), mutation.key().z()) : null; int cell = plan.cellAt(index);
int x = baseX | ObjectSourcePlan.cellX(cell);
int y = ObjectSourcePlan.cellY(cell);
int z = baseZ | ObjectSourcePlan.cellZ(cell);
Object value = plan.valueAt(index);
boolean custom = ObjectSourcePlan.isCustom(cell);
boolean canopy = ObjectSourcePlan.isCanopy(cell);
if (custom || value instanceof NativeBlockState) {
NativeBlockState existing = canopy ? get(x, y, z) : null;
skipCanopy = existing != null && existing.isSolid(); skipCanopy = existing != null && existing.isSolid();
} }
if (mutation.canopy() && skipCanopy) { if (canopy && skipCanopy) {
continue; continue;
} }
switch (mutation) { if (custom) {
case SetMutation set -> setData(set.key().x(), set.key().y(), set.key().z(), set.value(), set); set(x, y, z, (NativeBlockState) value, true, canopy);
case CustomBlockMutation custom -> set(custom.key().x(), custom.key().y(), custom.key().z(), custom.state(), custom); } else {
setData(x, y, z, value, true, canopy);
} }
} }
} }
private void commitFenced() { private void commitFenced() {
LinkedHashMap<DataKey, Object> originals = new LinkedHashMap<>(); CommitJournal journal = new CommitJournal();
try { try {
for (Mutation mutation : mutations) { for (int position = 0; position < log.size(); position++) {
if (!isDestination(mutation.x(), mutation.z())) { int x = log.x(position);
int z = log.z(position);
if (!isDestination(x, z)) {
continue; continue;
} }
captureOriginal(originals, mutation.key()); int y = log.y(position);
if (mutation.key().type() == NativeBlockState.class) { Object value = log.value(position);
TileWrapper tile = writer.getDataIfPresent( boolean custom = log.custom(position);
mutation.key().x(), mutation.key().y(), mutation.key().z(), TileWrapper.class); Class<?> type = log.type(position);
if (tile != null) { if (!journal.captured(x, y, z, type)) {
originals.putIfAbsent(new DataKey( journal.capture(x, y, z, type, publishedOrCleared(x, y, z, type));
mutation.key().x(), mutation.key().y(), mutation.key().z(), TileWrapper.class), tile); }
if (type == NativeBlockState.class) {
if (!journal.captured(x, y, z, TileWrapper.class)) {
TileWrapper tile = writer.getDataIfPresent(x, y, z, TileWrapper.class);
if (tile != null) {
journal.capture(x, y, z, TileWrapper.class, tile);
}
} }
Identifier identifier = writer.getDataIfPresent( if (!journal.captured(x, y, z, Identifier.class)) {
mutation.key().x(), mutation.key().y(), mutation.key().z(), Identifier.class); Identifier identifier = writer.getDataIfPresent(x, y, z, Identifier.class);
if (identifier != null || mutation instanceof CustomBlockMutation) { if (identifier != null || custom) {
originals.putIfAbsent(new DataKey( journal.capture(x, y, z, Identifier.class, identifier == null ? CLEARED : identifier);
mutation.key().x(), mutation.key().y(), mutation.key().z(), Identifier.class), }
identifier == null ? CLEARED : identifier);
} }
} }
mutation.apply(writer); if (custom) {
writer.set(x, y, z, (NativeBlockState) value);
} else {
writer.setData(x, y, z, value);
}
} }
} catch (Throwable failure) { } catch (Throwable failure) {
rollback(originals, failure); journal.rollback(failure);
if (failure instanceof RuntimeException runtimeException) { if (failure instanceof RuntimeException runtimeException) {
throw runtimeException; throw runtimeException;
} }
@@ -149,10 +179,10 @@ final class ObjectDestinationTransaction implements ObjectPassPlacer {
@Override @Override
public void set(int x, int y, int z, NativeBlockState state) { public void set(int x, int y, int z, NativeBlockState state) {
set(x, y, z, state, null); set(x, y, z, state, false, false);
} }
private void set(int x, int y, int z, NativeBlockState state, CustomBlockMutation replayed) { private void set(int x, int y, int z, NativeBlockState state, boolean replayed, boolean replayedCanopy) {
if (state == null) { if (state == null) {
return; return;
} }
@@ -167,8 +197,7 @@ final class ObjectDestinationTransaction implements ObjectPassPlacer {
cell.block = baseState; cell.block = baseState;
cell.tile = CLEARED; cell.tile = CLEARED;
cell.identifier = identifier; cell.identifier = identifier;
mutations.add(replayed != null log.add(x, y, z, state, true, replayed ? replayedCanopy : isCanopy(x, y, z));
? replayed : new CustomBlockMutation(new DataKey(x, y, z, NativeBlockState.class), state, isCanopy(x, y, z)));
return; return;
} }
setData(x, y, z, state); setData(x, y, z, state);
@@ -262,10 +291,10 @@ final class ObjectDestinationTransaction implements ObjectPassPlacer {
@Override @Override
public <T> void setData(int x, int y, int z, T data) { public <T> void setData(int x, int y, int z, T data) {
setData(x, y, z, data, null); setData(x, y, z, data, false, false);
} }
private void setData(int x, int y, int z, Object data, SetMutation replayed) { private void setData(int x, int y, int z, Object data, boolean replayed, boolean replayedCanopy) {
if (data == null || y < 0 || y >= worldHeight if (data == null || y < 0 || y >= worldHeight
|| protectsSubterrain(x, y, z)) { || protectsSubterrain(x, y, z)) {
return; return;
@@ -285,8 +314,7 @@ final class ObjectDestinationTransaction implements ObjectPassPlacer {
} else { } else {
cell.put(type, data); cell.put(type, data);
} }
mutations.add(replayed != null log.add(x, y, z, data, false, replayed ? replayedCanopy : isCanopy(x, y, z));
? replayed : new SetMutation(new DataKey(x, y, z, type), data, isCanopy(x, y, z)));
} }
@Override @Override
@@ -368,18 +396,6 @@ final class ObjectDestinationTransaction implements ObjectPassPlacer {
return value == null ? CLEARED : value; return value == null ? CLEARED : value;
} }
private void captureOriginal(LinkedHashMap<DataKey, Object> originals, DataKey key) {
originals.computeIfAbsent(
key,
candidate -> publishedOrCleared(
candidate.x(),
candidate.y(),
candidate.z(),
candidate.type()
)
);
}
private boolean isDestination(int x, int z) { private boolean isDestination(int x, int z) {
return (x >> 4) == destinationChunkX && (z >> 4) == destinationChunkZ; return (x >> 4) == destinationChunkX && (z >> 4) == destinationChunkZ;
} }
@@ -396,8 +412,17 @@ final class ObjectDestinationTransaction implements ObjectPassPlacer {
} }
private boolean protectsSubterrain(int x, int y, int z) { private boolean protectsSubterrain(int x, int y, int z) {
if (subterrainKnown && x == subterrainX && y == subterrainY && z == subterrainZ) {
return subterrainProtects;
}
Engine engine = getEngine(); Engine engine = getEngine();
return engine != null && SubterrainRasterizer.protectsPlacement(engine.getSubterrainCell(x, y, z)); boolean protects = engine != null && SubterrainRasterizer.protectsPlacement(engine.getSubterrainCell(x, y, z));
subterrainX = x;
subterrainY = y;
subterrainZ = z;
subterrainProtects = protects;
subterrainKnown = true;
return protects;
} }
private boolean hasProtectedHydrology(int x, int y, int z) { private boolean hasProtectedHydrology(int x, int y, int z) {
@@ -419,22 +444,44 @@ final class ObjectDestinationTransaction implements ObjectPassPlacer {
return hydrologyGateOpen; return hydrologyGateOpen;
} }
private void rollback(LinkedHashMap<DataKey, Object> originals, Throwable failure) { private final class CommitJournal {
ArrayList<Map.Entry<DataKey, Object>> entries = new ArrayList<>(originals.entrySet()); private final Reference2IntOpenHashMap<Class<?>> typeIds = new Reference2IntOpenHashMap<>();
for (int index = entries.size() - 1; index >= 0; index--) { private final LongOpenHashSet keys = new LongOpenHashSet();
Map.Entry<DataKey, Object> entry = entries.get(index); private final ArrayList<Original> originals = new ArrayList<>();
DataKey key = entry.getKey();
try { private long key(int x, int y, int z, Class<?> type) {
writer.restoreData(key.x(), key.y(), key.z(), key.type(), int typeId = typeIds.computeIfAbsent(type, (Class<?> ignored) -> typeIds.size());
entry.getValue() == CLEARED ? null : entry.getValue()); return ((long) typeId << 32) | ((long) y << 8) | ((long) (z & 15) << 4) | (x & 15);
} catch (Throwable rollbackFailure) { }
if (rollbackFailure != failure) {
failure.addSuppressed(rollbackFailure); private boolean captured(int x, int y, int z, Class<?> type) {
return keys.contains(key(x, y, z, type));
}
private void capture(int x, int y, int z, Class<?> type, Object value) {
if (keys.add(key(x, y, z, type))) {
originals.add(new Original(x, y, z, type, value));
}
}
private void rollback(Throwable failure) {
for (int index = originals.size() - 1; index >= 0; index--) {
Original original = originals.get(index);
try {
writer.restoreData(original.x(), original.y(), original.z(), original.type(),
original.value() == CLEARED ? null : original.value());
} catch (Throwable rollbackFailure) {
if (rollbackFailure != failure) {
failure.addSuppressed(rollbackFailure);
}
} }
} }
} }
} }
private record Original(int x, int y, int z, Class<?> type, Object value) {
}
private static final class OverlayCell { private static final class OverlayCell {
private Object block; private Object block;
private Object hydrology; private Object hydrology;
@@ -506,8 +553,6 @@ final class ObjectDestinationTransaction implements ObjectPassPlacer {
DataKey key(); DataKey key();
boolean canopy(); boolean canopy();
void apply(IObjectPlacer placer);
} }
record SetMutation(DataKey key, Object value, boolean canopy) implements Mutation { record SetMutation(DataKey key, Object value, boolean canopy) implements Mutation {
@@ -520,11 +565,6 @@ final class ObjectDestinationTransaction implements ObjectPassPlacer {
public int z() { public int z() {
return key.z(); return key.z();
} }
@Override
public void apply(IObjectPlacer placer) {
placer.setData(key.x(), key.y(), key.z(), value);
}
} }
record CustomBlockMutation(DataKey key, NativeBlockState state, boolean canopy) implements Mutation { record CustomBlockMutation(DataKey key, NativeBlockState state, boolean canopy) implements Mutation {
@@ -537,10 +577,5 @@ final class ObjectDestinationTransaction implements ObjectPassPlacer {
public int z() { public int z() {
return key.z(); return key.z();
} }
@Override
public void apply(IObjectPlacer placer) {
placer.set(key.x(), key.y(), key.z(), state);
}
} }
} }
@@ -20,7 +20,6 @@ import it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.Objects;
final class ObjectSourcePlan { final class ObjectSourcePlan {
static final ObjectSourcePlan EMPTY = new ObjectSourcePlan(List.of()); static final ObjectSourcePlan EMPTY = new ObjectSourcePlan(List.of());
@@ -45,18 +44,21 @@ final class ObjectSourcePlan {
private final int estimatedRetainedBytes; private final int estimatedRetainedBytes;
ObjectSourcePlan(List<ObjectDestinationTransaction.Mutation> mutations) { ObjectSourcePlan(List<ObjectDestinationTransaction.Mutation> mutations) {
this(mutations, List.of()); this(MutationLog.of(mutations), 0, List.of());
} }
ObjectSourcePlan(List<ObjectDestinationTransaction.Mutation> mutations, List<ObjectDestinationTransaction.PlacementRange> accepted) { ObjectSourcePlan(List<ObjectDestinationTransaction.Mutation> mutations, List<ObjectDestinationTransaction.PlacementRange> accepted) {
int count = mutations.size(); this(MutationLog.of(mutations), 0, accepted);
}
ObjectSourcePlan(MutationLog log, int from, List<ObjectDestinationTransaction.PlacementRange> accepted) {
int count = log.size() - from;
long[] mutationDestinations = new long[count]; long[] mutationDestinations = new long[count];
Long2IntOpenHashMap destinationSlots = new Long2IntOpenHashMap(); Long2IntOpenHashMap destinationSlots = new Long2IntOpenHashMap();
destinationSlots.defaultReturnValue(-1); destinationSlots.defaultReturnValue(-1);
LongArrayList firstSeen = new LongArrayList(); LongArrayList firstSeen = new LongArrayList();
for (int index = 0; index < count; index++) { for (int index = 0; index < count; index++) {
ObjectDestinationTransaction.Mutation mutation = Objects.requireNonNull(mutations.get(index), "mutation"); long destination = destinationKey(log.x(from + index) >> 4, log.z(from + index) >> 4);
long destination = destinationKey(mutation.x() >> 4, mutation.z() >> 4);
mutationDestinations[index] = destination; mutationDestinations[index] = destination;
if (destinationSlots.putIfAbsent(destination, firstSeen.size()) == -1) { if (destinationSlots.putIfAbsent(destination, firstSeen.size()) == -1) {
firstSeen.add(destination); firstSeen.add(destination);
@@ -80,38 +82,23 @@ final class ObjectSourcePlan {
valueIndexes = new int[count]; valueIndexes = new int[count];
ValueTable table = new ValueTable(); ValueTable table = new ValueTable();
for (int index = 0; index < count; index++) { for (int index = 0; index < count; index++) {
ObjectDestinationTransaction.Mutation mutation = mutations.get(index); int logged = from + index;
int position = cursor[destinationSlots.get(mutationDestinations[index])]++; int position = cursor[destinationSlots.get(mutationDestinations[index])]++;
positions[index] = position; positions[index] = position;
ObjectDestinationTransaction.DataKey key = mutation.key(); int y = log.y(logged);
if (key.y() < 0 || key.y() > MAXIMUM_Y) { if (y < 0 || y > MAXIMUM_Y) {
throw new IllegalArgumentException("Object mutation height is outside the plan range: " + key.y()); throw new IllegalArgumentException("Object mutation height is outside the plan range: " + y);
} }
Object value; cells[position] = (y << Y_SHIFT) | (log.custom(logged) ? CUSTOM_BIT : 0) | (log.canopy(logged) ? CANOPY_BIT : 0)
int custom; | ((log.z(logged) & 15) << 4) | (log.x(logged) & 15);
switch (mutation) { valueIndexes[position] = table.indexOf(log.value(logged));
case ObjectDestinationTransaction.SetMutation set -> {
value = Objects.requireNonNull(set.value(), "mutation value");
if (typeOf(value) != key.type()) {
throw new IllegalArgumentException("Object mutation type " + key.type().getName()
+ " does not match its value " + value.getClass().getName());
}
custom = 0;
}
case ObjectDestinationTransaction.CustomBlockMutation block -> {
value = Objects.requireNonNull(block.state(), "custom block state");
custom = CUSTOM_BIT;
}
}
cells[position] = (key.y() << Y_SHIFT) | custom | (mutation.canopy() ? CANOPY_BIT : 0) | ((key.z() & 15) << 4) | (key.x() & 15);
valueIndexes[position] = table.indexOf(value);
} }
values = table.values.toArray(); values = table.values.toArray();
ArrayList<Placement> crossing = new ArrayList<>(); ArrayList<Placement> crossing = new ArrayList<>();
for (int ordinal = 0; ordinal < accepted.size(); ordinal++) { for (int ordinal = 0; ordinal < accepted.size(); ordinal++) {
ObjectDestinationTransaction.PlacementRange range = accepted.get(ordinal); ObjectDestinationTransaction.PlacementRange range = accepted.get(ordinal);
Placement placement = crossingPlacement(ordinal, range.start(), range.end(), mutations, mutationDestinations, destinationSlots, positions); Placement placement = crossingPlacement(ordinal, range.start(), range.end(), log, from, mutationDestinations, destinationSlots, positions);
if (placement != null) { if (placement != null) {
crossing.add(placement); crossing.add(placement);
} }
@@ -147,12 +134,13 @@ final class ObjectSourcePlan {
int ordinal, int ordinal,
int start, int start,
int end, int end,
List<ObjectDestinationTransaction.Mutation> mutations, MutationLog log,
int from,
long[] mutationDestinations, long[] mutationDestinations,
Long2IntOpenHashMap destinationSlots, Long2IntOpenHashMap destinationSlots,
int[] positions int[] positions
) { ) {
if (start < 0 || end > mutations.size() || start >= end) { if (start < 0 || end > log.size() - from || start >= end) {
throw new IllegalArgumentException("Object placement range is outside the plan"); throw new IllegalArgumentException("Object placement range is outside the plan");
} }
long first = mutationDestinations[start]; long first = mutationDestinations[start];
@@ -172,11 +160,12 @@ final class ObjectSourcePlan {
int maximumX = Integer.MIN_VALUE; int maximumX = Integer.MIN_VALUE;
int maximumZ = Integer.MIN_VALUE; int maximumZ = Integer.MIN_VALUE;
for (int mutationIndex = start; mutationIndex < end; mutationIndex++) { for (int mutationIndex = start; mutationIndex < end; mutationIndex++) {
ObjectDestinationTransaction.Mutation mutation = mutations.get(mutationIndex); int mutationX = log.x(from + mutationIndex);
minimumX = Math.min(minimumX, mutation.x()); int mutationZ = log.z(from + mutationIndex);
minimumZ = Math.min(minimumZ, mutation.z()); minimumX = Math.min(minimumX, mutationX);
maximumX = Math.max(maximumX, mutation.x()); minimumZ = Math.min(minimumZ, mutationZ);
maximumZ = Math.max(maximumZ, mutation.z()); maximumX = Math.max(maximumX, mutationX);
maximumZ = Math.max(maximumZ, mutationZ);
long destination = mutationDestinations[mutationIndex]; long destination = mutationDestinations[mutationIndex];
int touchedIndex = touchedIndexes.get(destination); int touchedIndex = touchedIndexes.get(destination);
if (touchedIndex < 0) { if (touchedIndex < 0) {
@@ -216,6 +205,55 @@ final class ObjectSourcePlan {
return destinations.length == 0; return destinations.length == 0;
} }
int slotStart(int slot) {
return offsets[slot];
}
int slotEnd(int slot) {
return offsets[slot + 1];
}
int cellAt(int index) {
return cells[index];
}
Object valueAt(int index) {
return values[valueIndexes[index]];
}
static int cellX(int cell) {
return cell & 15;
}
static int cellZ(int cell) {
return (cell >>> 4) & 15;
}
static int cellY(int cell) {
return cell >>> Y_SHIFT;
}
static boolean isCustom(int cell) {
return (cell & CUSTOM_BIT) != 0;
}
static boolean isCanopy(int cell) {
return (cell & CANOPY_BIT) != 0;
}
ObjectDestinationTransaction.Mutation mutationAt(int chunkX, int chunkZ, int index) {
int cell = cells[index];
int x = (chunkX << 4) | cellX(cell);
int z = (chunkZ << 4) | cellZ(cell);
int y = cellY(cell);
Object value = valueAt(index);
return isCustom(cell)
? new ObjectDestinationTransaction.CustomBlockMutation(
new ObjectDestinationTransaction.DataKey(x, y, z, NativeBlockState.class), (NativeBlockState) value, isCanopy(cell))
: new ObjectDestinationTransaction.SetMutation(
new ObjectDestinationTransaction.DataKey(x, y, z, typeOf(value)), value, isCanopy(cell));
}
List<ObjectDestinationTransaction.Mutation> mutationsFor(int chunkX, int chunkZ) { List<ObjectDestinationTransaction.Mutation> mutationsFor(int chunkX, int chunkZ) {
int slot = destinationSlot(chunkX, chunkZ); int slot = destinationSlot(chunkX, chunkZ);
return slot < 0 ? List.of() : decode(chunkX, chunkZ, offsets[slot], offsets[slot + 1] - offsets[slot]); return slot < 0 ? List.of() : decode(chunkX, chunkZ, offsets[slot], offsets[slot + 1] - offsets[slot]);
@@ -266,19 +304,8 @@ final class ObjectSourcePlan {
private List<ObjectDestinationTransaction.Mutation> decode(int chunkX, int chunkZ, int start, int length) { private List<ObjectDestinationTransaction.Mutation> decode(int chunkX, int chunkZ, int start, int length) {
ObjectDestinationTransaction.Mutation[] decoded = new ObjectDestinationTransaction.Mutation[length]; ObjectDestinationTransaction.Mutation[] decoded = new ObjectDestinationTransaction.Mutation[length];
int baseX = chunkX << 4;
int baseZ = chunkZ << 4;
for (int index = 0; index < length; index++) { for (int index = 0; index < length; index++) {
int cell = cells[start + index]; decoded[index] = mutationAt(chunkX, chunkZ, start + index);
int x = baseX | (cell & 15);
int z = baseZ | ((cell >>> 4) & 15);
int y = cell >>> Y_SHIFT;
Object value = values[valueIndexes[start + index]];
decoded[index] = (cell & CUSTOM_BIT) != 0
? new ObjectDestinationTransaction.CustomBlockMutation(
new ObjectDestinationTransaction.DataKey(x, y, z, NativeBlockState.class), (NativeBlockState) value, (cell & CANOPY_BIT) != 0)
: new ObjectDestinationTransaction.SetMutation(
new ObjectDestinationTransaction.DataKey(x, y, z, typeOf(value)), value, (cell & CANOPY_BIT) != 0);
} }
return List.of(decoded); return List.of(decoded);
} }
@@ -4,6 +4,7 @@ import com.github.benmanes.caffeine.cache.Cache;
import com.github.benmanes.caffeine.cache.Caffeine; import com.github.benmanes.caffeine.cache.Caffeine;
import art.arcane.volmlib.util.cache.CacheKey; import art.arcane.volmlib.util.cache.CacheKey;
import java.util.List;
import java.util.Objects; import java.util.Objects;
import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletionException; import java.util.concurrent.CompletionException;
@@ -14,6 +15,7 @@ import java.util.function.Supplier;
import static art.arcane.iris.generation.cache.Cache.key; import static art.arcane.iris.generation.cache.Cache.key;
final class ObjectSourcePlanCache { final class ObjectSourcePlanCache {
static final ObjectSourcePlan BUSY = new ObjectSourcePlan(List.of());
private static final long MAXIMUM_RETAINED_BYTES = 512L * 1024L * 1024L; private static final long MAXIMUM_RETAINED_BYTES = 512L * 1024L * 1024L;
private static final int ENTRY_BYTES = 64; private static final int ENTRY_BYTES = 64;
@@ -68,6 +70,19 @@ final class ObjectSourcePlanCache {
return plan; return plan;
} }
ObjectSourcePlan tryAcquire(int sourceChunkX, int sourceChunkZ, int destinationChunkX, int destinationChunkZ,
int sourceChunkRadius, Supplier<ObjectSourcePlan> builder) {
State current = state;
long source = CacheKey.mix(key(sourceChunkX, sourceChunkZ));
if (current.plans.getIfPresent(source) == null) {
Pending pending = current.pending.get(source);
if (pending != null && pending.owner != Thread.currentThread()) {
return BUSY;
}
}
return acquire(sourceChunkX, sourceChunkZ, destinationChunkX, destinationChunkZ, sourceChunkRadius, builder);
}
private ObjectSourcePlan claim(State current, long source, Entry entry, int destinationChunkX, int destinationChunkZ, private ObjectSourcePlan claim(State current, long source, Entry entry, int destinationChunkX, int destinationChunkZ,
Supplier<ObjectSourcePlan> builder) { Supplier<ObjectSourcePlan> builder) {
int slot = entry.slot(destinationChunkX, destinationChunkZ); int slot = entry.slot(destinationChunkX, destinationChunkZ);
@@ -61,6 +61,7 @@ import java.io.InputStream;
import java.io.OutputStream; import java.io.OutputStream;
import java.util.Map; import java.util.Map;
import java.util.Objects; import java.util.Objects;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock;
import java.util.function.BiConsumer; import java.util.function.BiConsumer;
@@ -144,6 +145,7 @@ public class IrisObject extends IrisRegistrant {
protected transient AtomicCache<AxisAlignedBB> aabb = new AtomicCache<>(); protected transient AtomicCache<AxisAlignedBB> aabb = new AtomicCache<>();
transient final AtomicCache<KList<IrisBlockVector>> surfaceSupportOffsets = new AtomicCache<>(); transient final AtomicCache<KList<IrisBlockVector>> surfaceSupportOffsets = new AtomicCache<>();
transient final AtomicCache<FloatingObjectFootprint> floatingFootprint = new AtomicCache<>(); transient final AtomicCache<FloatingObjectFootprint> floatingFootprint = new AtomicCache<>();
transient final ConcurrentHashMap<ObjectPlacementBake.Key, ObjectPlacementBake> placementBakes = new ConcurrentHashMap<>();
@Getter @Getter
@Setter @Setter
private transient TreeGrounding treeGrounding; private transient TreeGrounding treeGrounding;
@@ -30,7 +30,6 @@ import art.arcane.iris.generation.decoration.IrisVacuumSettings;
import art.arcane.iris.world.entity.IrisMarker; import art.arcane.iris.world.entity.IrisMarker;
import art.arcane.iris.pack.loading.IrisData; import art.arcane.iris.pack.loading.IrisData;
import art.arcane.iris.generation.runtime.GenerationFailures;
import art.arcane.iris.generation.runtime.IrisComplex; import art.arcane.iris.generation.runtime.IrisComplex;
import art.arcane.iris.generation.runtime.Engine; import art.arcane.iris.generation.runtime.Engine;
import art.arcane.volmlib.nativelib.terrain.structure.NativeStructureVolume; import art.arcane.volmlib.nativelib.terrain.structure.NativeStructureVolume;
@@ -52,6 +51,7 @@ import art.arcane.volmlib.util.matter.MatterMarker;
import it.unimi.dsi.fastutil.longs.Long2LongOpenHashMap; import it.unimi.dsi.fastutil.longs.Long2LongOpenHashMap;
import java.util.Comparator; import java.util.Comparator;
import java.util.IdentityHashMap;
import java.util.Objects; import java.util.Objects;
import java.util.Optional; import java.util.Optional;
import java.util.Set; import java.util.Set;
@@ -475,127 +475,53 @@ final class IrisObjectPlacementRunner {
int vacuumLowest = Integer.MAX_VALUE; int vacuumLowest = Integer.MAX_VALUE;
int vacuumHighest = Integer.MIN_VALUE; int vacuumHighest = Integer.MIN_VALUE;
self.readLock.lock(); self.readLock.lock();
KMap<IrisBlockVector, String> markers = null;
try { try {
VectorMap<NativeBlockState> blocks = self.blocks; ObjectPlacementBake bake = ObjectPlacementBake.of(self, spin, ceilingHang, translating ? translateOffset : null);
VectorMap<TileData> states = self.states; PlacementStates palette = new PlacementStates(bake.palette(), config.getRotation(), spinx, spiny, spinz,
TreeGrounding tree = self.getTreeGrounding(); preventingDecay, placer.isDebugSmartBore(), excludedStiltMaterials);
// Zero-tile objects are the common case: skip the two Key allocations VectorMap#get needs to prove null. double[] exact = warped || hasEdits || eroding ? bake.exact(self, spin) : null;
boolean hasStates = !states.isEmpty(); String[] markers = config.getMarkers().isNotEmpty() && placer.getEngine() != null
? resolveMarkers(config, rng, x, yv, z, rdata, bake) : null;
int[] tileBlocks = bake.tileBlocks();
TileData[] tileValues = bake.tileValues();
int tileCursor = 0;
int count = bake.count();
if (config.getMarkers().isNotEmpty() && placer.getEngine() != null) { for (int index = 0; index < count; index++) {
markers = new KMap<>(); int entry = bake.paletteIndex(index);
KList<IrisBlockVector> list = StreamSupport.stream(blocks.keys().spliterator(), false)
.collect(KList.collector());
// Marker selection persists into the mantle, so it must be seed-deterministic.
// Derive a side stream keyed on the placement position instead of consuming the
// caller's rng: consuming draws there would shift every later placement in the
// chunk and invalidate existing worlds/goldenhashes.
RNG markerRng = rng.nextParallelRNG(((((long) x) << 32) | (z & 0xFFFFFFFFL)) * 31L + yv);
int markerIndex = 0;
for (IrisObjectMarker j : config.getMarkers()) {
IrisMarker marker = self.getLoader().getMarkerLoader().load(j.getMarker());
int markerSalt = markerIndex++;
if (marker == null || marker.isCompatExcluded()) {
continue;
}
int max = j.getMaximumMarkers();
for (IrisBlockVector i : list.shuffleCopy(markerRng.nextParallelRNG(markerSalt))) {
if (max <= 0) {
break;
}
NativeBlockState data = blocks.get(i);
if (data == null) {
continue;
}
for (NativeBlockState k : j.getMark(rdata)) {
if (max <= 0) {
break;
}
if (j.isExact() ? k.matches(data) : IrisObjectShaping.materialKey(k).equals(IrisObjectShaping.materialKey(data))) {
boolean a = !blocks.containsKey((IrisBlockVector) i.clone().add(new IrisBlockVector(0, 1, 0)));
boolean fff = !blocks.containsKey((IrisBlockVector) i.clone().add(new IrisBlockVector(0, 2, 0)));
if (!marker.isEmptyAbove() || (a && fff)) {
markers.put(i, j.getMarker());
max--;
}
}
}
}
}
}
VectorMap<NativeBlockState>.Cursor cursor = blocks.cursor();
while (cursor.next()) {
IrisBlockVector g = cursor.key();
NativeBlockState d;
TileData tile = null; TileData tile = null;
if (tileBlocks != null && tileCursor < tileBlocks.length && tileBlocks[tileCursor] == index) {
tile = tileValues[tileCursor++];
}
try { if (stilting && palette.stiltLayer(entry)) {
d = cursor.value(); int layer = bake.layerY(index);
if (hasStates) { if (layer < lowest) {
tile = states.get(g); lowest = layer;
} }
} catch (Throwable e) { if (layer > topLayer) {
GenerationFailures.rethrowEngineFailure(e); topLayer = layer;
IrisLogging.reportError(e);
IrisLogging.warn("Failed to read block node " + g.getBlockX() + "," + g.getBlockY() + "," + g.getBlockZ() + " in object " + self.getLoadKey() + " (cme)");
d = IrisObject.States.air();
}
if (d == null) {
IrisLogging.warn("Failed to read block node " + g.getBlockX() + "," + g.getBlockY() + "," + g.getBlockZ() + " in object " + self.getLoadKey() + " (null)");
d = IrisObject.States.air();
}
if (placer.isDebugSmartBore() && IrisObject.States.vair().equals(d)) {
d = IrisObject.States.vairDebug();
}
NativeBlockState data = d;
IrisBlockVector i = g.clone();
spin.rotate(i);
if (ceilingHang) {
i.setY(-i.getBlockY());
}
if (translating) {
i.add(translateOffset);
}
if (stilting && IrisObjectShaping.isStiltLayerBlock(data)) {
if (i.getBlockY() < lowest) {
lowest = i.getBlockY();
}
if (i.getBlockY() > topLayer) {
topLayer = i.getBlockY();
} }
} }
if (preventingDecay && IrisProceduralBlocks.hasProperty(data, "distance") && "false".equals(IrisProceduralBlocks.propertyValue(data, "persistent"))) { NativeBlockState data = palette.decayed(entry);
data = data.withProperty("persistent", "true"); boolean edited = false;
}
if (hasEdits) { if (hasEdits) {
double exactX = exact[index * 3];
double exactY = exact[index * 3 + 1];
double exactZ = exact[index * 3 + 2];
for (IrisObjectReplace j : config.getEdit()) { for (IrisObjectReplace j : config.getEdit()) {
if (rng.chance(j.getChance())) { if (rng.chance(j.getChance())) {
for (NativeBlockState k : j.getFind(rdata)) { for (NativeBlockState k : j.getFind(rdata)) {
if (j.isExact() ? k.matches(data) : IrisObjectShaping.materialKey(k).equals(IrisObjectShaping.materialKey(data))) { if (j.isExact() ? k.matches(data) : IrisObjectShaping.materialKey(k).equals(IrisObjectShaping.materialKey(data))) {
NativeBlockState newData = j.getReplace(rng, i.getX() + x, i.getY() + y, i.getZ() + z, rdata); NativeBlockState newData = j.getReplace(rng, exactX + x, exactY + y, exactZ + z, rdata);
boolean sameMaterial = IrisObjectShaping.materialKey(newData).equals(IrisObjectShaping.materialKey(data)); boolean sameMaterial = IrisObjectShaping.materialKey(newData).equals(IrisObjectShaping.materialKey(data));
if (sameMaterial && !(newData.isCustom() || data.isCustom())) if (sameMaterial && !(newData.isCustom() || data.isCustom()))
data = BlockDataMergeSupport.merge(data, newData); data = BlockDataMergeSupport.merge(data, newData);
else else
data = newData; data = newData;
edited = true;
Optional<TileData> t = j.getReplace().getTile(rng, x, y, z, rdata); Optional<TileData> t = j.getReplace().getTile(rng, x, y, z, rdata);
if (t.isPresent()) { if (t.isPresent()) {
@@ -609,18 +535,21 @@ final class IrisObjectPlacementRunner {
} }
} }
data = config.getRotation().rotate(data, spinx, spiny, spinz); StateFacts facts = edited ? palette.factsOf(data) : palette.facts(entry);
if (data == null) { NativeBlockState rotated = facts.rotated();
if (rotated == null) {
continue; continue;
} }
xx = x + (int) Math.round(i.getX()); xx = x + bake.offsetX(index);
int yy = y + bake.offsetY(index);
int yy = y + (int) Math.round(i.getY()); zz = z + bake.offsetZ(index);
zz = z + (int) Math.round(i.getZ());
if (warped) { if (warped) {
xx += surfaceWarp.fitDouble(-warpHalf, warpHalf, i.getX() + x, i.getY() + y, i.getZ() + z); double exactX = exact[index * 3];
zz += surfaceWarp.fitDouble(-warpHalf, warpHalf, i.getZ() + z, i.getY() + y, i.getX() + x); double exactY = exact[index * 3 + 1];
double exactZ = exact[index * 3 + 2];
xx += surfaceWarp.fitDouble(-warpHalf, warpHalf, exactX + x, exactY + y, exactZ + z);
zz += surfaceWarp.fitDouble(-warpHalf, warpHalf, exactZ + z, exactY + y, exactX + x);
} }
if (paint) { if (paint) {
@@ -628,8 +557,8 @@ final class IrisObjectPlacementRunner {
if (surface == IrisPaintSurfaceProjection.MISSING) { if (surface == IrisPaintSurfaceProjection.MISSING) {
continue; continue;
} }
if (!B.isVineBlock(data)) { if (!B.isVineBlock(rotated)) {
yy = (int) Math.round(i.getY()) + Math.floorDiv(self.h, 2) + surface + yrand; yy = bake.offsetY(index) + Math.floorDiv(self.h, 2) + surface + yrand;
} }
} }
@@ -637,13 +566,18 @@ final class IrisObjectPlacementRunner {
continue; continue;
} }
boolean canopy = tree != null && tree.isCanopy(g.getBlockX(), g.getBlockY(), g.getBlockZ()); boolean canopy = bake.canopy(index);
if (canopy && !placer.beginTreeCanopy(new BlockPosition(xx, yy, zz))) { if (canopy && !placer.beginTreeCanopy(new BlockPosition(xx, yy, zz))) {
continue; continue;
} }
try { try {
data = normalizePlacedWaterlogging(data, placer, xx, yy, zz, waterlogCandidate); data = rotated;
if (facts.waterloggable()) {
data = waterlogCandidate || facts.authoredWaterlogged()
? IrisProceduralBlocks.normalizeWaterlogging(data, placer.get(xx, yy, zz), waterlogCandidate)
: facts.dry();
}
if (!rawStructurePiece && B.isVineBlock(data)) { if (!rawStructurePiece && B.isVineBlock(data)) {
data = attachVineFaces(placer, data, xx, yy, zz); data = attachVineFaces(placer, data, xx, yy, zz);
@@ -652,9 +586,7 @@ final class IrisObjectPlacementRunner {
// Short-circuit order matters for cost only: the mantle read is paid solely // Short-circuit order matters for cost only: the mantle read is paid solely
// for vine blocks. Both operands are pure, so the value is unchanged. // for vine blocks. Both operands are pure, so the value is unchanged.
boolean wouldReplace = !rawStructurePiece && B.isVineBlock(data) && B.isSolid(placer.get(xx, yy, zz)); boolean wouldReplace = !rawStructurePiece && B.isVineBlock(data) && B.isSolid(placer.get(xx, yy, zz));
String material = IrisObjectShaping.materialKey(data); boolean place = shouldPlaceObjectBlock(rawStructurePiece, facts.air(), wouldReplace);
boolean air = material.equals("minecraft:air") || material.equals("minecraft:cave_air");
boolean place = shouldPlaceObjectBlock(rawStructurePiece, air, wouldReplace);
if (data.isCustom() || place) { if (data.isCustom() || place) {
placer.set(xx, yy, zz, data); placer.set(xx, yy, zz, data);
@@ -668,8 +600,8 @@ final class IrisObjectPlacementRunner {
if (tile != null) { if (tile != null) {
placer.setTile(xx, yy, zz, tile); placer.setTile(xx, yy, zz, tile);
} }
if (markers != null && markers.containsKey(g)) { if (markers != null && markers[index] != null) {
placer.setData(xx, yy, zz, new MatterMarker(markers.get(g))); placer.setData(xx, yy, zz, new MatterMarker(markers[index]));
} }
if (listener != null) { if (listener != null) {
listener.accept(new BlockPosition(xx, yy, zz), data); listener.accept(new BlockPosition(xx, yy, zz), data);
@@ -687,27 +619,21 @@ final class IrisObjectPlacementRunner {
} }
} }
} }
} finally {
self.readLock.unlock();
}
if (grounding != null) { if (grounding != null) {
for (TreeGrounding.Extension extension : grounding.extensions()) { for (TreeGrounding.Extension extension : grounding.extensions()) {
for (int rootY = extension.topY(); rootY >= extension.bottomY(); rootY--) { for (int rootY = extension.topY(); rootY >= extension.bottomY(); rootY--) {
NativeBlockState rootState = normalizePlacedWaterlogging(extension.state(), placer, NativeBlockState rootState = normalizePlacedWaterlogging(extension.state(), placer,
extension.x(), rootY, extension.z(), waterlogCandidate); extension.x(), rootY, extension.z(), waterlogCandidate);
placer.set(extension.x(), rootY, extension.z(), rootState); placer.set(extension.x(), rootY, extension.z(), rootState);
if (listener != null) { if (listener != null) {
listener.accept(new BlockPosition(extension.x(), rootY, extension.z()), rootState); listener.accept(new BlockPosition(extension.x(), rootY, extension.z()), rootState);
}
} }
} }
} }
}
if (stilting) { if (stilting) {
self.readLock.lock();
try {
VectorMap<NativeBlockState> blocks = self.blocks;
IrisStiltSettings settings = stiltSettings; IrisStiltSettings settings = stiltSettings;
double erodeCentroidX = 0; double erodeCentroidX = 0;
@@ -715,93 +641,51 @@ final class IrisObjectPlacementRunner {
double erodeMaxDist = 1; double erodeMaxDist = 1;
if (eroding) { if (eroding) {
int centroidCount = 0; int centroidCount = 0;
VectorMap<NativeBlockState>.Cursor centroidCursor = blocks.cursor(); for (int index = 0; index < count; index++) {
while (centroidCursor.next()) { if (bake.layerY(index) == lowest && palette.shouldStilt(bake.paletteIndex(index))) {
IrisBlockVector rot = centroidCursor.key().clone(); erodeCentroidX += exact[index * 3];
spin.rotate(rot); erodeCentroidZ += exact[index * 3 + 2];
if (translating) { centroidCount++;
rot.add(translateOffset);
}
if (rot.getBlockY() == lowest) {
NativeBlockState bd = centroidCursor.value();
if (bd != null && IrisObjectShaping.shouldStilt(bd, excludedStiltMaterials)) {
erodeCentroidX += rot.getX();
erodeCentroidZ += rot.getZ();
centroidCount++;
}
} }
} }
if (centroidCount > 0) { if (centroidCount > 0) {
erodeCentroidX /= centroidCount; erodeCentroidX /= centroidCount;
erodeCentroidZ /= centroidCount; erodeCentroidZ /= centroidCount;
} }
VectorMap<NativeBlockState>.Cursor spreadCursor = blocks.cursor(); for (int index = 0; index < count; index++) {
while (spreadCursor.next()) { if (bake.layerY(index) == lowest && palette.shouldStilt(bake.paletteIndex(index))) {
IrisBlockVector rot = spreadCursor.key().clone(); double dx = exact[index * 3] - erodeCentroidX;
spin.rotate(rot); double dz = exact[index * 3 + 2] - erodeCentroidZ;
if (translating) { double dist = Math.sqrt(dx * dx + dz * dz);
rot.add(translateOffset); if (dist > erodeMaxDist) {
} erodeMaxDist = dist;
if (rot.getBlockY() == lowest) {
NativeBlockState bd = spreadCursor.value();
if (bd != null && IrisObjectShaping.shouldStilt(bd, excludedStiltMaterials)) {
double dx = rot.getX() - erodeCentroidX;
double dz = rot.getZ() - erodeCentroidZ;
double dist = Math.sqrt(dx * dx + dz * dz);
if (dist > erodeMaxDist) {
erodeMaxDist = dist;
}
} }
} }
} }
} }
VectorMap<NativeBlockState>.Cursor stiltCursor = blocks.cursor(); int targetLayer = ceilingHang ? topLayer : lowest;
while (stiltCursor.next()) { for (int index = 0; index < count; index++) {
IrisBlockVector g = stiltCursor.key(); int entry = bake.paletteIndex(index);
NativeBlockState sourceData; if (!palette.shouldStilt(entry)) {
try {
sourceData = stiltCursor.value();
} catch (Throwable e) {
GenerationFailures.rethrowEngineFailure(e);
IrisLogging.reportError(e);
IrisLogging.warn("Failed to read block node " + g.getBlockX() + "," + g.getBlockY() + "," + g.getBlockZ() + " in object " + self.getLoadKey() + " (stilt cme)");
sourceData = IrisObject.States.air();
}
if (sourceData == null) {
IrisLogging.warn("Failed to read block node " + g.getBlockX() + "," + g.getBlockY() + "," + g.getBlockZ() + " in object " + self.getLoadKey() + " (stilt null)");
sourceData = IrisObject.States.air();
}
if (!IrisObjectShaping.shouldStilt(sourceData, excludedStiltMaterials)) {
continue; continue;
} }
NativeBlockState d = sourceData; NativeBlockState d;
if (settings != null && settings.getPalette() != null) { if (settings != null && settings.getPalette() != null) {
d = config.getStiltSettings().getPalette().get(rng, x, y, z, rdata); d = config.getStiltSettings().getPalette().get(rng, x, y, z, rdata);
} else { } else {
String mat = IrisObjectShaping.materialKey(d); d = palette.stiltDefault(entry);
if (mat.equals("minecraft:grass_block") || mat.equals("minecraft:mycelium") || mat.equals("minecraft:podzol") || mat.equals("minecraft:dirt_path")) {
d = IrisObject.States.dirt();
}
} }
IrisBlockVector i = g.clone(); if (bake.layerY(index) != targetLayer)
spin.rotate(i);
if (ceilingHang) {
i.setY(-i.getBlockY());
}
if (translating) {
i.add(translateOffset);
}
int targetLayer = ceilingHang ? topLayer : lowest;
if (i.getBlockY() != targetLayer)
continue; continue;
d = config.getRotation().rotate(d, spinx, spiny, spinz); d = palette.rotate(d);
if (hasEdits) { if (hasEdits) {
double exactX = exact[index * 3];
double exactY = exact[index * 3 + 1];
double exactZ = exact[index * 3 + 2];
for (IrisObjectReplace j : config.getEdit()) { for (IrisObjectReplace j : config.getEdit()) {
if (rng.chance(j.getChance())) { if (rng.chance(j.getChance())) {
for (NativeBlockState k : j.getFind(rdata)) { for (NativeBlockState k : j.getFind(rdata)) {
@@ -809,7 +693,7 @@ final class IrisObjectPlacementRunner {
continue; continue;
} }
if (j.isExact() ? k.matches(d) : IrisObjectShaping.materialKey(k).equals(IrisObjectShaping.materialKey(d))) { if (j.isExact() ? k.matches(d) : IrisObjectShaping.materialKey(k).equals(IrisObjectShaping.materialKey(d))) {
NativeBlockState newData = j.getReplace(rng, i.getX() + x, i.getY() + y, i.getZ() + z, rdata); NativeBlockState newData = j.getReplace(rng, exactX + x, exactY + y, exactZ + z, rdata);
if (IrisObjectShaping.materialKey(newData).equals(IrisObjectShaping.materialKey(d))) { if (IrisObjectShaping.materialKey(newData).equals(IrisObjectShaping.materialKey(d))) {
d = BlockDataMergeSupport.merge(d, newData); d = BlockDataMergeSupport.merge(d, newData);
@@ -822,15 +706,18 @@ final class IrisObjectPlacementRunner {
} }
} }
if (d == null || !IrisObjectShaping.shouldStilt(d, excludedStiltMaterials)) if (d == null || !palette.shouldStiltPlaced(d))
continue; continue;
xx = x + (int) Math.round(i.getX()); xx = x + bake.offsetX(index);
zz = z + (int) Math.round(i.getZ()); zz = z + bake.offsetZ(index);
if (warped) { if (warped) {
xx += surfaceWarp.fitDouble(-warpHalf, warpHalf, i.getX() + x, i.getY() + y, i.getZ() + z); double exactX = exact[index * 3];
zz += surfaceWarp.fitDouble(-warpHalf, warpHalf, i.getZ() + z, i.getY() + y, i.getX() + x); double exactY = exact[index * 3 + 1];
double exactZ = exact[index * 3 + 2];
xx += surfaceWarp.fitDouble(-warpHalf, warpHalf, exactX + x, exactY + y, exactZ + z);
zz += surfaceWarp.fitDouble(-warpHalf, warpHalf, exactZ + z, exactY + y, exactX + x);
} }
if (organic) { if (organic) {
@@ -891,8 +778,6 @@ final class IrisObjectPlacementRunner {
int highest = placer.getHighest(xx, zz, self.getLoader(), true); int highest = placer.getHighest(xx, zz, self.getLoader(), true);
int lowerBound = highest - 1; int lowerBound = highest - 1;
if (settings != null) { if (settings != null) {
lowerBound -= config.getStiltSettings().getOverStilt() - rng.i(0, config.getStiltSettings().getYRand()); lowerBound -= config.getStiltSettings().getOverStilt() - rng.i(0, config.getStiltSettings().getYRand());
@@ -901,8 +786,8 @@ final class IrisObjectPlacementRunner {
} }
if (eroding) { if (eroding) {
double dx = i.getX() - erodeCentroidX; double dx = exact[index * 3] - erodeCentroidX;
double dz = i.getZ() - erodeCentroidZ; double dz = exact[index * 3 + 2] - erodeCentroidZ;
double normalizedDist = Math.sqrt(dx * dx + dz * dz) / erodeMaxDist; double normalizedDist = Math.sqrt(dx * dx + dz * dz) / erodeMaxDist;
normalizedDist = Math.min(normalizedDist, 1.0); normalizedDist = Math.min(normalizedDist, 1.0);
int totalDepth = (lowest + y) - lowerBound; int totalDepth = (lowest + y) - lowerBound;
@@ -933,11 +818,10 @@ final class IrisObjectPlacementRunner {
} }
placer.set(xx, j, zz, normalizePlacedWaterlogging(d, placer, xx, j, zz, waterlogCandidate)); placer.set(xx, j, zz, normalizePlacedWaterlogging(d, placer, xx, j, zz, waterlogCandidate));
} }
} }
} finally {
self.readLock.unlock();
} }
} finally {
self.readLock.unlock();
} }
if (vacuuming && vacuumLowest != Integer.MAX_VALUE && placer.getEngine() != null) { if (vacuuming && vacuumLowest != Integer.MAX_VALUE && placer.getEngine() != null) {
@@ -974,9 +858,76 @@ final class IrisObjectPlacementRunner {
if (state == null || !IrisProceduralBlocks.hasProperty(state, "waterlogged")) { if (state == null || !IrisProceduralBlocks.hasProperty(state, "waterlogged")) {
return state; return state;
} }
if (!enabled && !"true".equals(IrisProceduralBlocks.propertyValue(state, "waterlogged"))) {
return IrisProceduralBlocks.normalizeWaterlogging(state, null, false);
}
return IrisProceduralBlocks.normalizeWaterlogging(state, placer.get(x, y, z), enabled); return IrisProceduralBlocks.normalizeWaterlogging(state, placer.get(x, y, z), enabled);
} }
private String[] resolveMarkers(IrisObjectPlacement config, RNG rng, int x, int yv, int z, IrisData rdata,
ObjectPlacementBake bake) {
self.readLock.lock();
try {
VectorMap<NativeBlockState> blocks = self.blocks;
KMap<IrisBlockVector, String> markers = new KMap<>();
KList<IrisBlockVector> list = StreamSupport.stream(blocks.keys().spliterator(), false)
.collect(KList.collector());
// Marker selection persists into the mantle, so it must be seed-deterministic.
// Derive a side stream keyed on the placement position instead of consuming the
// caller's rng: consuming draws there would shift every later placement in the
// chunk and invalidate existing worlds/goldenhashes.
RNG markerRng = rng.nextParallelRNG(((((long) x) << 32) | (z & 0xFFFFFFFFL)) * 31L + yv);
int markerIndex = 0;
for (IrisObjectMarker j : config.getMarkers()) {
IrisMarker marker = self.getLoader().getMarkerLoader().load(j.getMarker());
int markerSalt = markerIndex++;
if (marker == null || marker.isCompatExcluded()) {
continue;
}
int max = j.getMaximumMarkers();
for (IrisBlockVector i : list.shuffleCopy(markerRng.nextParallelRNG(markerSalt))) {
if (max <= 0) {
break;
}
NativeBlockState data = blocks.get(i);
if (data == null) {
continue;
}
for (NativeBlockState k : j.getMark(rdata)) {
if (max <= 0) {
break;
}
if (j.isExact() ? k.matches(data) : IrisObjectShaping.materialKey(k).equals(IrisObjectShaping.materialKey(data))) {
boolean a = !blocks.containsKey((IrisBlockVector) i.clone().add(new IrisBlockVector(0, 1, 0)));
boolean fff = !blocks.containsKey((IrisBlockVector) i.clone().add(new IrisBlockVector(0, 2, 0)));
if (!marker.isEmptyAbove() || (a && fff)) {
markers.put(i, j.getMarker());
max--;
}
}
}
}
}
String[] resolved = new String[bake.count()];
VectorMap<NativeBlockState>.Cursor cursor = blocks.cursor();
int index = 0;
while (index < resolved.length && cursor.next()) {
resolved[index++] = markers.get(cursor.key());
}
return resolved;
} finally {
self.readLock.unlock();
}
}
private KList<IrisBlockVector> transformedPaintSupport(SpinKernel spin, IrisBlockVector translateOffset, private KList<IrisBlockVector> transformedPaintSupport(SpinKernel spin, IrisBlockVector translateOffset,
CNG warp, double half, int x, int y, int z) { CNG warp, double half, int x, int y, int z) {
KList<IrisBlockVector> offsets = new KList<>(); KList<IrisBlockVector> offsets = new KList<>();
@@ -1337,152 +1288,159 @@ final class IrisObjectPlacementRunner {
return result; return result;
} }
/** private record StateFacts(NativeBlockState rotated, boolean waterloggable, boolean authoredWaterlogged,
* Precomputed vector rotation for a single placement. NativeBlockState dry, boolean air) {
* <p> private static final StateFacts ROTATED_AWAY = new StateFacts(null, false, false, null, false);
* This mirrors {@link IrisObjectRotation#rotate(IrisBlockVector, int, int, int)} branch for branch, with two }
* differences: it mutates the vector handed to it instead of cloning, and the per-axis angle plus its cosine
* and sine are resolved once instead of once per block. The angle is a pure function of the axis clamp and the
* spin, both fixed for the placement, and Math.cos/Math.sin are pure, so every produced double is identical to
* the value the per-call form would have produced.
*/
private static final class SpinKernel {
private static final int MODE_NONE = 0;
private static final int MODE_FLIP = 1;
private static final int MODE_QUARTER = 2;
private static final int MODE_THREE_QUARTER = 3;
private static final int MODE_ANGLE = 4;
private final boolean rotates; private static final class PlacementStates {
private final int xMode; private static final Object ROTATED_AWAY = new Object();
private final int yMode; private static final byte UNKNOWN = 0;
private final int zMode; private static final byte NO = 1;
private final double xCos; private static final byte YES = 2;
private final double xSin;
private final double yCos;
private final double ySin;
private final double zCos;
private final double zSin;
private SpinKernel(IrisObjectRotation rotation, int spinx, int spiny, int spinz) { private final NativeBlockState[] palette;
rotates = rotation.canRotate(); private final IrisObjectRotation rotation;
xMode = rotation.canRotateX() ? modeOf(rotation.getXAxis()) : MODE_NONE; private final int spinx;
zMode = rotation.canRotateZ() ? modeOf(rotation.getZAxis()) : MODE_NONE; private final int spiny;
yMode = rotation.canRotateY() ? modeOf(rotation.getYAxis()) : MODE_NONE; private final int spinz;
private final boolean preventingDecay;
private final boolean debugSmartBore;
private final Set<String> excludedStiltMaterials;
private final NativeBlockState[] decayed;
private final StateFacts[] facts;
private final byte[] stiltLayers;
private final byte[] stilts;
private final NativeBlockState[] stiltDefaults;
private IdentityHashMap<NativeBlockState, Object> rotations;
private IdentityHashMap<NativeBlockState, StateFacts> editedFacts;
private IdentityHashMap<NativeBlockState, Boolean> placedStilts;
double xAngle = xMode == MODE_ANGLE ? rotation.getXRotation(spinx) : 0; private PlacementStates(NativeBlockState[] palette, IrisObjectRotation rotation, int spinx, int spiny, int spinz,
double zAngle = zMode == MODE_ANGLE ? rotation.getZRotation(spinz) : 0; boolean preventingDecay, boolean debugSmartBore, Set<String> excludedStiltMaterials) {
double yAngle = yMode == MODE_ANGLE ? rotation.getYRotation(spiny) : 0; this.palette = palette;
xCos = Math.cos(xAngle); this.rotation = rotation;
xSin = Math.sin(xAngle); this.spinx = spinx;
zCos = Math.cos(zAngle); this.spiny = spiny;
zSin = Math.sin(zAngle); this.spinz = spinz;
yCos = Math.cos(yAngle); this.preventingDecay = preventingDecay;
ySin = Math.sin(yAngle); this.debugSmartBore = debugSmartBore;
this.excludedStiltMaterials = excludedStiltMaterials;
this.decayed = new NativeBlockState[palette.length];
this.facts = new StateFacts[palette.length];
this.stiltLayers = new byte[palette.length];
this.stilts = new byte[palette.length];
this.stiltDefaults = new NativeBlockState[palette.length];
} }
private static int modeOf(IrisAxisRotationClamp clamp) { private NativeBlockState source(int entry) {
if (!clamp.isLocked()) { NativeBlockState state = palette[entry];
return MODE_ANGLE; return debugSmartBore && IrisObject.States.vair().equals(state) ? IrisObject.States.vairDebug() : state;
}
if (Math.abs(clamp.getMax()) % 360D == 180D) {
return MODE_FLIP;
}
if (clamp.getMax() % 360D == 90D || clamp.getMax() % 360D == -270D) {
return MODE_QUARTER;
}
if (clamp.getMax() == -90D || clamp.getMax() % 360D == 270D) {
return MODE_THREE_QUARTER;
}
return MODE_ANGLE;
} }
/** private boolean stiltLayer(int entry) {
* Rotates in place. Axis order (X, then Z, then Y) is load bearing. byte known = stiltLayers[entry];
*/ if (known == UNKNOWN) {
private void rotate(IrisBlockVector v) { known = IrisObjectShaping.isStiltLayerBlock(source(entry)) ? YES : NO;
if (!rotates) { stiltLayers[entry] = known;
return;
} }
return known == YES;
}
switch (xMode) { private NativeBlockState decayed(int entry) {
case MODE_FLIP -> { NativeBlockState resolved = decayed[entry];
v.setZ(-v.getZ()); if (resolved == null) {
v.setY(-v.getY()); NativeBlockState data = source(entry);
} resolved = preventingDecay && IrisProceduralBlocks.hasProperty(data, "distance")
case MODE_QUARTER -> { && "false".equals(IrisProceduralBlocks.propertyValue(data, "persistent"))
double z = v.getZ(); ? data.withProperty("persistent", "true") : data;
v.setZ(v.getY()); decayed[entry] = resolved;
v.setY(-z);
}
case MODE_THREE_QUARTER -> {
double z = v.getZ();
v.setZ(-v.getY());
v.setY(z);
}
case MODE_ANGLE -> {
double y = xCos * v.getY() - xSin * v.getZ();
double z = xSin * v.getY() + xCos * v.getZ();
v.setY(y);
v.setZ(z);
}
default -> {
}
} }
return resolved;
}
switch (zMode) { private StateFacts facts(int entry) {
case MODE_FLIP -> { StateFacts resolved = facts[entry];
v.setY(-v.getY()); if (resolved == null) {
v.setX(-v.getX()); resolved = computeFacts(decayed(entry));
} facts[entry] = resolved;
case MODE_QUARTER -> {
double y = v.getY();
v.setY(v.getX());
v.setX(-y);
}
case MODE_THREE_QUARTER -> {
double y = v.getY();
v.setY(-v.getX());
v.setX(y);
}
case MODE_ANGLE -> {
double x = zCos * v.getX() - zSin * v.getY();
double y = zSin * v.getX() + zCos * v.getY();
v.setX(x);
v.setY(y);
}
default -> {
}
} }
return resolved;
}
switch (yMode) { private StateFacts factsOf(NativeBlockState state) {
case MODE_FLIP -> { if (editedFacts == null) {
v.setX(-v.getX()); editedFacts = new IdentityHashMap<>();
v.setZ(-v.getZ());
}
case MODE_QUARTER -> {
double x = v.getX();
v.setX(v.getZ());
v.setZ(-x);
}
case MODE_THREE_QUARTER -> {
double x = v.getX();
v.setX(-v.getZ());
v.setZ(x);
}
case MODE_ANGLE -> {
double x = yCos * v.getX() + ySin * v.getZ();
double z = -ySin * v.getX() + yCos * v.getZ();
v.setX(x);
v.setZ(z);
}
default -> {
}
} }
StateFacts resolved = editedFacts.get(state);
if (resolved == null) {
resolved = computeFacts(state);
editedFacts.put(state, resolved);
}
return resolved;
}
private StateFacts computeFacts(NativeBlockState state) {
NativeBlockState rotated = rotate(state);
if (rotated == null) {
return StateFacts.ROTATED_AWAY;
}
boolean waterloggable = IrisProceduralBlocks.hasProperty(rotated, "waterlogged");
boolean authored = waterloggable && "true".equals(IrisProceduralBlocks.propertyValue(rotated, "waterlogged"));
NativeBlockState dry = waterloggable ? IrisProceduralBlocks.normalizeWaterlogging(rotated, null, false) : rotated;
String material = IrisObjectShaping.materialKey(rotated);
boolean air = material.equals("minecraft:air") || material.equals("minecraft:cave_air");
return new StateFacts(rotated, waterloggable, authored, dry, air);
}
private NativeBlockState rotate(NativeBlockState state) {
if (state == null) {
return null;
}
if (rotations == null) {
rotations = new IdentityHashMap<>();
}
Object memo = rotations.get(state);
if (memo == null) {
NativeBlockState rotated = rotation.rotate(state, spinx, spiny, spinz);
memo = rotated == null ? ROTATED_AWAY : rotated;
rotations.put(state, memo);
}
return memo == ROTATED_AWAY ? null : (NativeBlockState) memo;
}
private boolean shouldStilt(int entry) {
byte known = stilts[entry];
if (known == UNKNOWN) {
known = IrisObjectShaping.shouldStilt(palette[entry], excludedStiltMaterials) ? YES : NO;
stilts[entry] = known;
}
return known == YES;
}
private NativeBlockState stiltDefault(int entry) {
NativeBlockState resolved = stiltDefaults[entry];
if (resolved == null) {
NativeBlockState state = palette[entry];
String material = IrisObjectShaping.materialKey(state);
resolved = material.equals("minecraft:grass_block") || material.equals("minecraft:mycelium")
|| material.equals("minecraft:podzol") || material.equals("minecraft:dirt_path")
? IrisObject.States.dirt() : state;
stiltDefaults[entry] = resolved;
}
return resolved;
}
private boolean shouldStiltPlaced(NativeBlockState state) {
if (placedStilts == null) {
placedStilts = new IdentityHashMap<>();
}
Boolean known = placedStilts.get(state);
if (known == null) {
known = IrisObjectShaping.shouldStilt(state, excludedStiltMaterials);
placedStilts.put(state, known);
}
return known;
} }
} }
@@ -0,0 +1,259 @@
package art.arcane.iris.structure.object;
import art.arcane.iris.generation.block.TileData;
import art.arcane.iris.generation.block.VectorMap;
import art.arcane.iris.generation.decoration.tree.TreeGrounding;
import art.arcane.iris.generation.geometry.IrisBlockVector;
import art.arcane.volmlib.nativelib.terrain.NativeBlockState;
import it.unimi.dsi.fastutil.ints.IntArrayList;
import java.util.ArrayList;
import java.util.IdentityHashMap;
import java.util.List;
import java.util.concurrent.ConcurrentHashMap;
final class ObjectPlacementBake {
private static final int MAXIMUM_VARIANTS_PER_OBJECT = 32;
private final long blocksRevision;
private final long statesRevision;
private final TreeGrounding grounding;
private final int count;
private final int[] offsetX;
private final int[] offsetY;
private final int[] offsetZ;
private final int[] layerY;
private final short[] paletteIndexes;
private final NativeBlockState[] palette;
private final int[] tileBlocks;
private final TileData[] tileValues;
private final long[] canopy;
private final Key key;
private volatile double[] exact;
private ObjectPlacementBake(Key key, long blocksRevision, long statesRevision, TreeGrounding grounding, int count,
int[] offsetX, int[] offsetY, int[] offsetZ, int[] layerY, short[] paletteIndexes,
NativeBlockState[] palette, int[] tileBlocks, TileData[] tileValues, long[] canopy) {
this.key = key;
this.blocksRevision = blocksRevision;
this.statesRevision = statesRevision;
this.grounding = grounding;
this.count = count;
this.offsetX = offsetX;
this.offsetY = offsetY;
this.offsetZ = offsetZ;
this.layerY = layerY;
this.paletteIndexes = paletteIndexes;
this.palette = palette;
this.tileBlocks = tileBlocks;
this.tileValues = tileValues;
this.canopy = canopy;
}
static ObjectPlacementBake of(IrisObject object, SpinKernel spin, boolean ceilingHang, IrisBlockVector translateOffset) {
Key key = Key.of(spin, ceilingHang, translateOffset);
ConcurrentHashMap<Key, ObjectPlacementBake> variants = object.placementBakes;
ObjectPlacementBake cached = variants.get(key);
if (cached != null && cached.matches(object)) {
return cached;
}
ObjectPlacementBake built = bake(object, key, spin, ceilingHang, translateOffset);
if (built.matches(object)) {
if (variants.size() >= MAXIMUM_VARIANTS_PER_OBJECT) {
variants.clear();
}
variants.put(key, built);
}
return built;
}
private static ObjectPlacementBake bake(IrisObject object, Key key, SpinKernel spin, boolean ceilingHang,
IrisBlockVector translateOffset) {
object.readLock.lock();
try {
VectorMap<NativeBlockState> blocks = object.blocks;
VectorMap<TileData> states = object.states;
long blocksRevision = blocks.modificationRevision();
long statesRevision = states.modificationRevision();
TreeGrounding grounding = object.getTreeGrounding();
boolean hasStates = !states.isEmpty();
IntArrayList x = new IntArrayList();
IntArrayList y = new IntArrayList();
IntArrayList z = new IntArrayList();
IntArrayList layer = new IntArrayList();
IntArrayList indexes = new IntArrayList();
IntArrayList tileBlocks = new IntArrayList();
List<TileData> tileValues = new ArrayList<>();
List<NativeBlockState> palette = new ArrayList<>();
IdentityHashMap<NativeBlockState, Integer> paletteSlots = new IdentityHashMap<>();
IntArrayList canopyBlocks = new IntArrayList();
boolean layerDiffers = false;
IrisBlockVector rotated = new IrisBlockVector(0, 0, 0);
VectorMap<NativeBlockState>.Cursor cursor = blocks.cursor();
int index = 0;
while (cursor.next()) {
IrisBlockVector source = cursor.key();
NativeBlockState state = cursor.value();
if (state == null) {
state = IrisObject.States.air();
}
transform(source, rotated, spin, ceilingHang, translateOffset);
int roundedY = (int) Math.round(rotated.getY());
int floorY = rotated.getBlockY();
x.add((int) Math.round(rotated.getX()));
y.add(roundedY);
z.add((int) Math.round(rotated.getZ()));
layer.add(floorY);
layerDiffers |= floorY != roundedY;
Integer slot = paletteSlots.get(state);
if (slot == null) {
slot = palette.size();
palette.add(state);
paletteSlots.put(state, slot);
}
indexes.add(slot);
if (hasStates) {
TileData tile = states.get(source);
if (tile != null) {
tileBlocks.add(index);
tileValues.add(tile);
}
}
if (grounding != null && grounding.isCanopy(source.getBlockX(), source.getBlockY(), source.getBlockZ())) {
canopyBlocks.add(index);
}
index++;
}
if (palette.size() > Short.MAX_VALUE) {
throw new IllegalStateException("Object " + object.getLoadKey() + " has more than "
+ Short.MAX_VALUE + " distinct block states");
}
short[] paletteIndexes = new short[index];
for (int block = 0; block < index; block++) {
paletteIndexes[block] = (short) indexes.getInt(block);
}
long[] canopy = null;
if (!canopyBlocks.isEmpty()) {
canopy = new long[(index + 63) >>> 6];
for (int block : canopyBlocks) {
canopy[block >>> 6] |= 1L << (block & 63);
}
}
return new ObjectPlacementBake(key, blocksRevision, statesRevision, grounding, index,
x.toIntArray(), y.toIntArray(), z.toIntArray(), layerDiffers ? layer.toIntArray() : null,
paletteIndexes, palette.toArray(new NativeBlockState[0]),
tileBlocks.isEmpty() ? null : tileBlocks.toIntArray(),
tileValues.isEmpty() ? null : tileValues.toArray(new TileData[0]), canopy);
} finally {
object.readLock.unlock();
}
}
private static void transform(IrisBlockVector source, IrisBlockVector target, SpinKernel spin, boolean ceilingHang,
IrisBlockVector translateOffset) {
target.setX(source.getX());
target.setY(source.getY());
target.setZ(source.getZ());
spin.rotate(target);
if (ceilingHang) {
target.setY(-target.getBlockY());
}
if (translateOffset != null) {
target.add(translateOffset);
}
}
boolean matches(IrisObject object) {
return object.blocks.modificationRevision() == blocksRevision
&& object.states.modificationRevision() == statesRevision
&& object.getTreeGrounding() == grounding;
}
int count() {
return count;
}
int offsetX(int index) {
return offsetX[index];
}
int offsetY(int index) {
return offsetY[index];
}
int offsetZ(int index) {
return offsetZ[index];
}
int layerY(int index) {
return layerY == null ? offsetY[index] : layerY[index];
}
int paletteIndex(int index) {
return paletteIndexes[index];
}
NativeBlockState[] palette() {
return palette;
}
int[] tileBlocks() {
return tileBlocks;
}
TileData[] tileValues() {
return tileValues;
}
boolean canopy(int index) {
return canopy != null && (canopy[index >>> 6] & (1L << (index & 63))) != 0L;
}
double[] exact(IrisObject object, SpinKernel spin) {
double[] resolved = exact;
if (resolved != null) {
return resolved;
}
object.readLock.lock();
try {
resolved = new double[count * 3];
IrisBlockVector rotated = new IrisBlockVector(0, 0, 0);
VectorMap<NativeBlockState>.Cursor cursor = object.blocks.cursor();
int index = 0;
while (cursor.next() && index < count) {
transform(cursor.key(), rotated, spin, key.ceilingHang(), key.translateOffset());
resolved[index * 3] = rotated.getX();
resolved[index * 3 + 1] = rotated.getY();
resolved[index * 3 + 2] = rotated.getZ();
index++;
}
if (index != count) {
throw new IllegalStateException("Object " + object.getLoadKey() + " changed while its placement bake was read");
}
} finally {
object.readLock.unlock();
}
exact = resolved;
return resolved;
}
record Key(boolean rotates, int xMode, int yMode, int zMode, long xCos, long xSin, long yCos, long ySin,
long zCos, long zSin, boolean ceilingHang, boolean translating, long translateX, long translateY,
long translateZ) {
static Key of(SpinKernel spin, boolean ceilingHang, IrisBlockVector translateOffset) {
boolean translating = translateOffset != null;
return new Key(spin.rotates, spin.xMode, spin.yMode, spin.zMode,
Double.doubleToLongBits(spin.xCos), Double.doubleToLongBits(spin.xSin),
Double.doubleToLongBits(spin.yCos), Double.doubleToLongBits(spin.ySin),
Double.doubleToLongBits(spin.zCos), Double.doubleToLongBits(spin.zSin), ceilingHang, translating,
translating ? Double.doubleToLongBits(translateOffset.getX()) : 0L,
translating ? Double.doubleToLongBits(translateOffset.getY()) : 0L,
translating ? Double.doubleToLongBits(translateOffset.getZ()) : 0L);
}
IrisBlockVector translateOffset() {
return translating ? new IrisBlockVector(Double.longBitsToDouble(translateX),
Double.longBitsToDouble(translateY), Double.longBitsToDouble(translateZ)) : null;
}
}
}
@@ -0,0 +1,152 @@
package art.arcane.iris.structure.object;
import art.arcane.iris.generation.geometry.IrisBlockVector;
/**
* Precomputed vector rotation for a single placement.
* <p>
* This mirrors {@link IrisObjectRotation#rotate(IrisBlockVector, int, int, int)} branch for branch, with two
* differences: it mutates the vector handed to it instead of cloning, and the per-axis angle plus its cosine
* and sine are resolved once instead of once per block. The angle is a pure function of the axis clamp and the
* spin, both fixed for the placement, and Math.cos/Math.sin are pure, so every produced double is identical to
* the value the per-call form would have produced.
*/
final class SpinKernel {
static final int MODE_NONE = 0;
static final int MODE_FLIP = 1;
static final int MODE_QUARTER = 2;
static final int MODE_THREE_QUARTER = 3;
static final int MODE_ANGLE = 4;
final boolean rotates;
final int xMode;
final int yMode;
final int zMode;
final double xCos;
final double xSin;
final double yCos;
final double ySin;
final double zCos;
final double zSin;
SpinKernel(IrisObjectRotation rotation, int spinx, int spiny, int spinz) {
rotates = rotation.canRotate();
xMode = rotation.canRotateX() ? modeOf(rotation.getXAxis()) : MODE_NONE;
zMode = rotation.canRotateZ() ? modeOf(rotation.getZAxis()) : MODE_NONE;
yMode = rotation.canRotateY() ? modeOf(rotation.getYAxis()) : MODE_NONE;
double xAngle = xMode == MODE_ANGLE ? rotation.getXRotation(spinx) : 0;
double zAngle = zMode == MODE_ANGLE ? rotation.getZRotation(spinz) : 0;
double yAngle = yMode == MODE_ANGLE ? rotation.getYRotation(spiny) : 0;
xCos = Math.cos(xAngle);
xSin = Math.sin(xAngle);
zCos = Math.cos(zAngle);
zSin = Math.sin(zAngle);
yCos = Math.cos(yAngle);
ySin = Math.sin(yAngle);
}
private static int modeOf(IrisAxisRotationClamp clamp) {
if (!clamp.isLocked()) {
return MODE_ANGLE;
}
if (Math.abs(clamp.getMax()) % 360D == 180D) {
return MODE_FLIP;
}
if (clamp.getMax() % 360D == 90D || clamp.getMax() % 360D == -270D) {
return MODE_QUARTER;
}
if (clamp.getMax() == -90D || clamp.getMax() % 360D == 270D) {
return MODE_THREE_QUARTER;
}
return MODE_ANGLE;
}
/**
* Rotates in place. Axis order (X, then Z, then Y) is load bearing.
*/
void rotate(IrisBlockVector v) {
if (!rotates) {
return;
}
switch (xMode) {
case MODE_FLIP -> {
v.setZ(-v.getZ());
v.setY(-v.getY());
}
case MODE_QUARTER -> {
double z = v.getZ();
v.setZ(v.getY());
v.setY(-z);
}
case MODE_THREE_QUARTER -> {
double z = v.getZ();
v.setZ(-v.getY());
v.setY(z);
}
case MODE_ANGLE -> {
double y = xCos * v.getY() - xSin * v.getZ();
double z = xSin * v.getY() + xCos * v.getZ();
v.setY(y);
v.setZ(z);
}
default -> {
}
}
switch (zMode) {
case MODE_FLIP -> {
v.setY(-v.getY());
v.setX(-v.getX());
}
case MODE_QUARTER -> {
double y = v.getY();
v.setY(v.getX());
v.setX(-y);
}
case MODE_THREE_QUARTER -> {
double y = v.getY();
v.setY(-v.getX());
v.setX(y);
}
case MODE_ANGLE -> {
double x = zCos * v.getX() - zSin * v.getY();
double y = zSin * v.getX() + zCos * v.getY();
v.setX(x);
v.setY(y);
}
default -> {
}
}
switch (yMode) {
case MODE_FLIP -> {
v.setX(-v.getX());
v.setZ(-v.getZ());
}
case MODE_QUARTER -> {
double x = v.getX();
v.setX(v.getZ());
v.setZ(-x);
}
case MODE_THREE_QUARTER -> {
double x = v.getX();
v.setX(-v.getZ());
v.setZ(x);
}
case MODE_ANGLE -> {
double x = yCos * v.getX() + ySin * v.getZ();
double z = -ySin * v.getX() + yCos * v.getZ();
v.setX(x);
v.setZ(z);
}
default -> {
}
}
}
}
@@ -0,0 +1,81 @@
package art.arcane.iris.generation.mantle;
import art.arcane.iris.testsupport.KeyedBlockState;
import art.arcane.volmlib.nativelib.terrain.NativeBlockState;
import org.junit.Test;
import java.util.ArrayList;
import java.util.List;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertThrows;
import static org.junit.Assert.assertTrue;
public class MutationLogTest {
@Test
public void logKeepsPositionsValuesAndFlagsInOrder() {
NativeBlockState state = new KeyedBlockState("minecraft:stone");
MutationLog log = MutationLog.of(List.of(
new ObjectDestinationTransaction.SetMutation(new ObjectDestinationTransaction.DataKey(3, 70, -2, String.class), "marker", true),
new ObjectDestinationTransaction.CustomBlockMutation(new ObjectDestinationTransaction.DataKey(-17, 4, 40, NativeBlockState.class), state, false)));
for (int index = 0; index < 100; index++) {
log.add(index, index + 1, -index, "grow" + index, (index & 1) == 0, (index & 2) == 0);
}
assertEquals(102, log.size());
assertEquals(3, log.x(0));
assertEquals(70, log.y(0));
assertEquals(-2, log.z(0));
assertEquals("marker", log.value(0));
assertFalse(log.custom(0));
assertTrue(log.canopy(0));
assertSame(String.class, log.type(0));
assertSame(state, log.value(1));
assertTrue(log.custom(1));
assertFalse(log.canopy(1));
assertSame(NativeBlockState.class, log.type(1));
assertEquals(99, log.x(101));
assertEquals("grow99", log.value(101));
assertFalse(log.custom(101));
assertTrue(log.canopy(98));
assertFalse(log.canopy(100));
}
@Test
public void mismatchedMutationTypesAreRejected() {
assertThrows(IllegalArgumentException.class, () -> MutationLog.of(List.of(
new ObjectDestinationTransaction.SetMutation(new ObjectDestinationTransaction.DataKey(0, 4, 0, Integer.class), "text", false))));
}
@Test
public void planSlicesMatchThePlanBuiltFromTheSameMutations() {
MutationLog log = new MutationLog();
List<ObjectDestinationTransaction.Mutation> tail = new ArrayList<>();
for (int index = 0; index < 64; index++) {
int x = (index * 7) - 30;
int y = 4 + index;
int z = (index * 5) - 20;
String value = "value" + (index % 9);
boolean canopy = index % 4 == 0;
log.add(x, y, z, value, false, canopy);
if (index >= 10) {
tail.add(new ObjectDestinationTransaction.SetMutation(new ObjectDestinationTransaction.DataKey(x, y, z, String.class), value, canopy));
}
}
ObjectSourcePlan sliced = new ObjectSourcePlan(log, 10, List.of());
ObjectSourcePlan expected = new ObjectSourcePlan(tail);
assertEquals(expected.destinationCount(), sliced.destinationCount());
int total = 0;
for (int chunkX = -3; chunkX <= 30; chunkX++) {
for (int chunkZ = -3; chunkZ <= 30; chunkZ++) {
List<ObjectDestinationTransaction.Mutation> mutations = sliced.mutationsFor(chunkX, chunkZ);
assertEquals(expected.mutationsFor(chunkX, chunkZ), mutations);
total += mutations.size();
}
}
assertEquals(54, total);
}
}
@@ -163,6 +163,44 @@ public class ObjectSourcePlanCacheTest {
} }
} }
@Test
public void tryAcquireReportsBusySourcesWithoutConsumingThem() throws Exception {
ObjectSourcePlanCache cache = new ObjectSourcePlanCache(1024L * 1024L);
ObjectSourcePlan plan = planTouching(new int[]{0, 0}, new int[]{1, 0});
CountDownLatch entered = new CountDownLatch(1);
CountDownLatch release = new CountDownLatch(1);
AtomicInteger builds = new AtomicInteger();
ExecutorService executor = Executors.newFixedThreadPool(1);
try {
Future<ObjectSourcePlan> owner = executor.submit(() -> cache.acquire(0, 0, 0, 0, 7, () -> {
builds.incrementAndGet();
entered.countDown();
await(release);
return plan;
}));
assertTrue(entered.await(5L, TimeUnit.SECONDS));
assertSame(ObjectSourcePlanCache.BUSY, cache.tryAcquire(0, 0, 1, 0, 7, () -> {
builds.incrementAndGet();
return plan;
}));
ObjectSourcePlan unrelated = planTouching(new int[]{5, 5});
assertSame(unrelated, cache.tryAcquire(5, 5, 5, 5, 7, () -> unrelated));
release.countDown();
assertSame(plan, owner.get(5L, TimeUnit.SECONDS));
assertSame(plan, cache.tryAcquire(0, 0, 1, 0, 7, () -> {
builds.incrementAndGet();
return plan;
}));
assertEquals(1, builds.get());
assertEquals(2L, cache.stats().drained());
} finally {
release.countDown();
executor.shutdownNow();
}
}
@Test @Test
public void concurrentDestinationsShareOneSourceBuild() throws Exception { public void concurrentDestinationsShareOneSourceBuild() throws Exception {
ObjectSourcePlanCache cache = new ObjectSourcePlanCache(1024L * 1024L); ObjectSourcePlanCache cache = new ObjectSourcePlanCache(1024L * 1024L);
@@ -791,7 +791,7 @@ public class IrisObjectPlacementRunnerRegressionTest {
object.place(0, ANCHOR_Y, 0, placer, placement, new RNG(2L), data); object.place(0, ANCHOR_Y, 0, placer, placement, new RNG(2L), data);
assertEquals(1, placer.blockReads); assertEquals(enabled || authored ? 1 : 0, placer.blockReads);
assertEquals(1, placer.writes().size()); assertEquals(1, placer.writes().size());
assertSame(submerged && (enabled || authored) ? wet : dry, assertSame(submerged && (enabled || authored) ? wet : dry,
placer.writes().get(0).state()); placer.writes().get(0).state());
@@ -0,0 +1,76 @@
package art.arcane.iris.structure.object;
import art.arcane.iris.generation.geometry.IrisBlockVector;
import art.arcane.iris.testsupport.KeyedBlockState;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotSame;
import static org.junit.Assert.assertSame;
public class ObjectPlacementBakeTest {
@Test
public void spinsResolvingToTheSameKernelShareOneBake() {
IrisObject object = object();
IrisObjectRotation rotation = new IrisObjectRotation();
ObjectPlacementBake first = ObjectPlacementBake.of(object, new SpinKernel(rotation, 0, 10, 0), false, null);
ObjectPlacementBake second = ObjectPlacementBake.of(object, new SpinKernel(rotation, 3, 80, 9), false, null);
ObjectPlacementBake turned = ObjectPlacementBake.of(object, new SpinKernel(rotation, 0, 100, 0), false, null);
assertSame(first, second);
assertNotSame(first, turned);
assertEquals(3, first.count());
}
@Test
public void bakedOffsetsMatchTheKernelTransformInCursorOrder() {
IrisObject object = object();
IrisObjectRotation rotation = IrisObjectRotation.of(0D, 90D, 0D);
SpinKernel spin = new SpinKernel(rotation, 0, 0, 0);
IrisBlockVector translate = new IrisBlockVector(1.5D, -2D, 0.25D);
ObjectPlacementBake bake = ObjectPlacementBake.of(object, spin, true, translate);
double[] exact = bake.exact(object, spin);
int index = 0;
for (IrisBlockVector source : object.getBlocks().keys()) {
IrisBlockVector expected = source.clone();
spin.rotate(expected);
expected.setY(-expected.getBlockY());
expected.add(translate);
assertEquals((int) Math.round(expected.getX()), bake.offsetX(index));
assertEquals((int) Math.round(expected.getY()), bake.offsetY(index));
assertEquals((int) Math.round(expected.getZ()), bake.offsetZ(index));
assertEquals(expected.getBlockY(), bake.layerY(index));
assertEquals(expected.getX(), exact[index * 3], 0D);
assertEquals(expected.getY(), exact[index * 3 + 1], 0D);
assertEquals(expected.getZ(), exact[index * 3 + 2], 0D);
index++;
}
assertEquals(bake.count(), index);
}
@Test
public void editedObjectsRebake() {
IrisObject object = object();
SpinKernel spin = new SpinKernel(new IrisObjectRotation(), 0, 0, 0);
ObjectPlacementBake before = ObjectPlacementBake.of(object, spin, false, null);
object.getBlocks().put(new IrisBlockVector(1, 1, 1), new KeyedBlockState("minecraft:dirt"));
ObjectPlacementBake after = ObjectPlacementBake.of(object, spin, false, null);
assertNotSame(before, after);
assertEquals(4, after.count());
assertSame(after, ObjectPlacementBake.of(object, spin, false, null));
}
private static IrisObject object() {
IrisObject object = new IrisObject(5, 5, 5);
KeyedBlockState stone = new KeyedBlockState("minecraft:stone");
object.getBlocks().put(new IrisBlockVector(-2, 0, 1), stone);
object.getBlocks().put(new IrisBlockVector(0, -1, 2), stone);
object.getBlocks().put(new IrisBlockVector(2, 2, -2), new KeyedBlockState("minecraft:oak_log[axis=y]"));
return object;
}
}
@@ -0,0 +1,761 @@
package art.arcane.iris.structure.object;
import art.arcane.iris.generation.block.BlockDataMergeSupport;
import art.arcane.iris.generation.block.IrisBlockData;
import art.arcane.iris.generation.block.TileData;
import art.arcane.iris.generation.cave.CarvingMode;
import art.arcane.iris.generation.decoration.IrisStiltSettings;
import art.arcane.iris.generation.decoration.IrisVacuumSettings;
import art.arcane.iris.generation.decoration.tree.TreeBlockCanvas;
import art.arcane.iris.generation.decoration.tree.TreeGrounding;
import art.arcane.iris.generation.geometry.IrisBlockVector;
import art.arcane.iris.generation.noise.IrisGeneratorStyle;
import art.arcane.iris.generation.noise.NoiseStyle;
import art.arcane.iris.generation.runtime.Engine;
import art.arcane.iris.generation.runtime.IrisComplex;
import art.arcane.iris.generation.terrain.IrisDimension;
import art.arcane.iris.generation.terrain.IrisMaterialPalette;
import art.arcane.iris.pack.loading.IrisData;
import art.arcane.iris.pack.loading.ResourceLoader;
import art.arcane.iris.pack.validation.ContentGate;
import art.arcane.iris.spi.IrisPlatform;
import art.arcane.iris.spi.IrisPlatforms;
import art.arcane.iris.spi.PlatformRegistries;
import art.arcane.iris.testsupport.PlatformLeakGuard;
import art.arcane.iris.world.entity.IrisMarker;
import art.arcane.volmlib.nativelib.terrain.NativeBlockState;
import art.arcane.volmlib.util.collection.KList;
import art.arcane.volmlib.util.collection.KMap;
import art.arcane.volmlib.util.math.BlockPosition;
import art.arcane.volmlib.util.math.RNG;
import art.arcane.volmlib.util.matter.MatterMarker;
import art.arcane.volmlib.util.stream.ProceduralStream;
import org.junit.After;
import org.junit.Before;
import org.junit.ClassRule;
import org.junit.Test;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Random;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.mockito.ArgumentMatchers.anyBoolean;
import static org.mockito.ArgumentMatchers.anyDouble;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import static org.mockito.Mockito.withSettings;
public class ObjectPlacementGoldenTest {
@ClassRule
public static final PlatformLeakGuard PLATFORM_GUARD = PlatformLeakGuard.clean();
private static final int OBJECTS = 200;
private static final int SEEDS = 5;
private static final long GOLDEN = 0x408f9d4113015897L;
private static final long MARKER_GOLDEN = 0x60b4bbf1144b239cL;
private static final List<String> PALETTE = List.of(
"minecraft:stone",
"minecraft:dirt",
"minecraft:grass_block[snowy=false]",
"minecraft:oak_log[axis=y]",
"minecraft:oak_log[axis=x]",
"minecraft:oak_leaves[distance=3,persistent=false,waterlogged=false]",
"minecraft:oak_leaves[distance=1,persistent=true,waterlogged=false]",
"minecraft:oak_leaves[distance=7,persistent=false,waterlogged=true]",
"minecraft:oak_stairs[facing=north,half=bottom,waterlogged=false]",
"minecraft:oak_stairs[facing=east,half=top,waterlogged=true]",
"minecraft:vine[east=false,north=true,south=false,up=false,west=false]",
"minecraft:air",
"minecraft:cave_air",
"minecraft:chest[facing=south,waterlogged=false]",
"minecraft:lantern[hanging=false,waterlogged=false]",
"minecraft:cobblestone",
"minecraft:glass",
"minecraft:oak_slab[type=bottom,waterlogged=false]");
private final Map<String, GoldenState> states = new ConcurrentHashMap<>();
private IrisData data;
private IrisData objectData;
private Engine engine;
private IrisObjectRotation.StateRotator previousRotator;
private BlockDataMergeSupport.StateMerger previousMerger;
@Before
public void bindPlatform() {
IrisPlatforms.unbind();
PlatformRegistries registries = mock(PlatformRegistries.class, withSettings().stubOnly());
when(registries.block(anyString())).thenAnswer(invocation -> state(invocation.getArgument(0)));
when(registries.blockOrNull(anyString())).thenAnswer(invocation -> state(invocation.getArgument(0)));
when(registries.blockOrNull(anyString(), anyBoolean())).thenAnswer(invocation -> state(invocation.getArgument(0)));
when(registries.air()).thenAnswer(invocation -> state("minecraft:air"));
IrisPlatform platform = mock(IrisPlatform.class, withSettings().stubOnly());
when(platform.registries()).thenReturn(registries);
IrisPlatforms.bind(platform);
previousRotator = IrisObjectRotation.bindPlatformRotator(ObjectPlacementGoldenTest::rotateState);
previousMerger = BlockDataMergeSupport.bindPlatformMerger(this::mergeStates);
ProceduralStream<NativeBlockState> rock = mock(ProceduralStream.class, withSettings().stubOnly());
when(rock.get(anyDouble(), anyDouble())).thenAnswer(invocation -> state("minecraft:stone"));
IrisComplex complex = mock(IrisComplex.class, withSettings().stubOnly());
when(complex.getRockStream()).thenReturn(rock);
IrisDimension dimension = mock(IrisDimension.class, withSettings().stubOnly());
engine = mock(Engine.class, withSettings().stubOnly());
when(engine.getHeight()).thenReturn(256);
when(engine.getMinHeight()).thenReturn(0);
when(engine.getComplex()).thenReturn(complex);
when(engine.getDimension()).thenReturn(dimension);
ContentGate gate = mock(ContentGate.class, withSettings().stubOnly());
when(gate.ready()).thenReturn(false);
data = mock(IrisData.class, withSettings().stubOnly());
when(data.getEngine()).thenReturn(engine);
when(data.getContentGate()).thenReturn(gate);
objectData = mock(IrisData.class, withSettings().stubOnly());
when(objectData.getContentGate()).thenReturn(gate);
}
@After
public void unbindPlatform() {
IrisObjectRotation.restorePlatformRotator(previousRotator);
BlockDataMergeSupport.restorePlatformMerger(previousMerger);
IrisPlatforms.unbind();
}
@Test
public void placementsMatchTheRecordedBlockStream() throws IOException {
Random random = new Random(20261021L);
List<IrisObjectRotation> rotations = rotations();
long combined = 17L;
StringBuilder dump = new StringBuilder();
for (int index = 0; index < OBJECTS; index++) {
IrisObject object = randomObject(random, index);
object.setLoader(objectData);
IrisObjectPlacement base = randomPlacement(random);
for (int rotationIndex = 0; rotationIndex < rotations.size(); rotationIndex++) {
IrisObjectPlacement placement = base.toPlacement("golden");
placement.setRotation(rotations.get(rotationIndex));
boolean explicitY = (index + rotationIndex) % 3 == 0;
for (int seed = 0; seed < SEEDS; seed++) {
RNG rng = new RNG(index * 1_000_003L + rotationIndex * 7919L + seed);
GoldenPlacer placer = new GoldenPlacer(engine, (index & 1) == 0);
List<String> listened = new ArrayList<>();
int x = 400 + index * 3 + seed;
int z = -900 + rotationIndex * 5 - seed;
int y = explicitY ? 90 + seed : -1;
int result;
if (placement.getMode() == ObjectPlaceMode.ORGANIC_STILT && explicitY && seed % 2 == 0) {
result = object.placeOnFloor(x, 70, z, placer, placement, rng,
(position, state) -> listened.add(position.getX() + "," + position.getY() + "," + position.getZ() + "=" + state.key()),
data);
} else {
result = object.place(x, y, z, placer, placement, rng,
(position, state) -> listened.add(position.getX() + "," + position.getY() + "," + position.getZ() + "=" + state.key()),
null, data);
}
long hash = placer.hash;
hash = mix(hash, result);
hash = mix(hash, rng.nextLong());
for (String entry : listened) {
hash = mix(hash, entry.hashCode());
}
hash = mix(hash, listened.size());
combined = mix(combined, hash);
dump.append(index).append(' ').append(rotationIndex).append(' ').append(seed).append(' ')
.append(Long.toHexString(hash)).append(' ').append(placer.writes).append('\n');
}
}
}
String dumpPath = System.getenv("IRIS_OBJECT_GOLDEN_DUMP");
if (dumpPath != null && !dumpPath.isBlank()) {
Files.writeString(Path.of(dumpPath), dump.toString());
}
assertEquals(Long.toHexString(GOLDEN), Long.toHexString(combined));
}
@Test
public void markedPlacementsMatchTheRecordedBlockStream() {
ResourceLoader<IrisMarker> markers = mock(ResourceLoader.class, withSettings().stubOnly());
IrisMarker anywhere = new IrisMarker();
anywhere.setEmptyAbove(false);
when(markers.load("anywhere")).thenReturn(anywhere);
when(markers.load("open")).thenReturn(new IrisMarker());
when(objectData.getMarkerLoader()).thenReturn(markers);
Random random = new Random(77L);
List<IrisObjectRotation> rotations = rotations();
long combined = 23L;
int markerWrites = 0;
for (int index = 0; index < 40; index++) {
IrisObject object = randomObject(random, index);
object.setLoader(objectData);
IrisObjectPlacement base = new IrisObjectPlacement();
base.setMode(ObjectPlaceMode.STRUCTURE_PIECE);
base.setRequireSurfaceSupport(false);
IrisObjectMarker loose = new IrisObjectMarker();
loose.setMarker("anywhere");
loose.setMaximumMarkers(1 + random.nextInt(6));
loose.setMark(new KList<>(new IrisBlockData("minecraft:stone"), new IrisBlockData("minecraft:oak_leaves")));
IrisObjectMarker exact = new IrisObjectMarker();
exact.setMarker("open");
exact.setExact(true);
exact.setMark(new KList<>(new IrisBlockData("minecraft:oak_log[axis=y]")));
base.setMarkers(new KList<>(loose, exact));
for (int rotationIndex = 0; rotationIndex < rotations.size(); rotationIndex++) {
IrisObjectPlacement placement = base.toPlacement("marked");
placement.setRotation(rotations.get(rotationIndex));
for (int seed = 0; seed < 3; seed++) {
RNG rng = new RNG(index * 31L + rotationIndex * 7L + seed);
GoldenPlacer placer = new GoldenPlacer(engine, false);
int result = object.place(100 + index, 80 + seed, 200 - index, placer, placement, rng, null, null, data);
long hash = mix(placer.hash, result);
hash = mix(hash, rng.nextLong());
combined = mix(combined, hash);
markerWrites += placer.markerWrites;
}
}
}
assertTrue(markerWrites > 100);
assertEquals(Long.toHexString(MARKER_GOLDEN), Long.toHexString(combined));
}
private static long mix(long hash, long value) {
long mixed = (hash ^ value) * 0x9E3779B97F4A7C15L;
return mixed ^ (mixed >>> 29);
}
private List<IrisObjectRotation> rotations() {
IrisObjectRotation defaultY = new IrisObjectRotation();
IrisObjectRotation lockedQuarter = IrisObjectRotation.of(0D, 90D, 0D);
IrisObjectRotation flipped = rotation(new IrisAxisRotationClamp(true, true, 180D, 180D, 0D),
new IrisAxisRotationClamp(true, false, 0D, 0D, 90D), new IrisAxisRotationClamp());
IrisObjectRotation angled = rotation(new IrisAxisRotationClamp(true, false, 0D, 0D, 90D),
new IrisAxisRotationClamp(true, false, 0D, 0D, 45D), new IrisAxisRotationClamp(true, false, 0D, 0D, 90D));
return List.of(defaultY, lockedQuarter, flipped, angled);
}
private IrisObjectPlacement randomPlacement(Random random) {
IrisObjectPlacement placement = new IrisObjectPlacement();
List<ObjectPlaceMode> modes = List.of(ObjectPlaceMode.CENTER_HEIGHT, ObjectPlaceMode.CENTER_HEIGHT,
ObjectPlaceMode.CENTER_HEIGHT, ObjectPlaceMode.STILT, ObjectPlaceMode.FAST_STILT,
ObjectPlaceMode.CENTER_STILT, ObjectPlaceMode.ERODE_STILT, ObjectPlaceMode.ORGANIC_STILT,
ObjectPlaceMode.CEILING_HANG, ObjectPlaceMode.MAX_HEIGHT, ObjectPlaceMode.FAST_MAX_HEIGHT,
ObjectPlaceMode.MIN_HEIGHT, ObjectPlaceMode.PAINT, ObjectPlaceMode.VACUUM, ObjectPlaceMode.VACUUM_ORGANIC,
ObjectPlaceMode.STRUCTURE_PIECE, ObjectPlaceMode.FLOATING, ObjectPlaceMode.FAST_MIN_STILT);
placement.setMode(modes.get(random.nextInt(modes.size())));
if (random.nextInt(4) == 0) {
placement.setTranslate(new IrisObjectTranslate()
.setX(random.nextInt(7) - 3)
.setY(random.nextInt(5) - 2)
.setZ(random.nextInt(7) - 3)
.setYRandom(random.nextInt(3) - 1));
}
if (random.nextInt(6) == 0) {
placement.setWarp(new IrisGeneratorStyle(NoiseStyle.SIMPLEX).setMultiplier(1D + random.nextInt(4)));
}
if (random.nextInt(3) == 0) {
placement.setEdit(randomEdits(random));
}
if (random.nextInt(4) == 0) {
placement.setStiltSettings(new IrisStiltSettings());
}
if (random.nextInt(5) == 0) {
placement.setVacuumSettings(new IrisVacuumSettings().setRadius(1 + random.nextInt(4)));
}
placement.setWaterloggable(random.nextInt(4) == 0);
placement.setUnderwater(random.nextInt(8) == 0);
placement.setOnwater(random.nextInt(10) == 0);
placement.setMeld(random.nextInt(8) == 0);
placement.setBore(random.nextInt(10) == 0);
placement.setForcePlace(random.nextInt(3) == 0);
placement.setBottom(random.nextInt(6) == 0);
placement.setSnow(random.nextInt(5) == 0 ? 0.7D : 0D);
placement.setRequireSurfaceSupport(random.nextInt(3) != 0);
placement.setSurfaceSupportBuffer(random.nextInt(3));
placement.setSurfaceSupportDepth(1 + random.nextInt(2));
placement.setCarvingSupport(switch (random.nextInt(5)) {
case 0 -> CarvingMode.ANYWHERE;
case 1 -> CarvingMode.CARVING_ONLY;
default -> CarvingMode.SURFACE_ONLY;
});
return placement;
}
private KList<IrisObjectReplace> randomEdits(Random random) {
KList<IrisObjectReplace> edits = new KList<>();
int count = 1 + random.nextInt(3);
for (int index = 0; index < count; index++) {
IrisObjectReplace replace = new IrisObjectReplace();
switch (random.nextInt(4)) {
case 0 -> {
replace.setFind(new KList<>(new IrisBlockData("minecraft:oak_leaves")));
replace.setReplace(palette("minecraft:cobblestone"));
}
case 1 -> {
replace.setFind(new KList<>(new IrisBlockData("minecraft:oak_stairs")));
replace.setReplace(palette("minecraft:oak_stairs[half=top]"));
}
case 2 -> {
replace.setExact(true);
replace.setFind(new KList<>(new IrisBlockData("minecraft:stone")));
replace.setReplace(palette("minecraft:glass"));
}
default -> {
replace.setFind(new KList<>(new IrisBlockData("minecraft:grass_block"), new IrisBlockData("minecraft:dirt")));
replace.setReplace(palette("minecraft:oak_leaves[distance=2,persistent=false,waterlogged=false]"));
}
}
replace.setChance(switch (random.nextInt(3)) {
case 0 -> 1F;
case 1 -> 0.5F;
default -> 0.15F;
});
edits.add(replace);
}
return edits;
}
private static IrisMaterialPalette palette(String key) {
IrisMaterialPalette palette = new IrisMaterialPalette();
palette.setPalette(new KList<>(new IrisBlockData(key)));
return palette;
}
private IrisObject randomObject(Random random, int index) {
int width = 1 + random.nextInt(9);
int height = 1 + random.nextInt(9);
int depth = 1 + random.nextInt(9);
IrisObject object = new IrisObject(width, height, depth);
int count = 1 + random.nextInt(Math.max(1, (width * height * depth) / 2));
List<IrisBlockVector> placed = new ArrayList<>();
for (int block = 0; block < count; block++) {
int x = random.nextInt(width) - (width / 2);
int y = random.nextInt(height) - (height / 2);
int z = random.nextInt(depth) - (depth / 2);
IrisBlockVector position = new IrisBlockVector(x, y, z);
String key = PALETTE.get(random.nextInt(PALETTE.size()));
object.getBlocks().put(position, state(key));
placed.add(position);
if (key.startsWith("minecraft:chest") && random.nextBoolean()) {
object.getStates().put(position, new TileData("minecraft:chest", new KMap<>()));
}
}
if (index % 4 == 1 && !placed.isEmpty()) {
List<TreeGrounding.Root> roots = new ArrayList<>();
Set<TreeBlockCanvas.Vec> canopy = new HashSet<>();
for (IrisBlockVector position : placed) {
if (random.nextInt(3) == 0) {
canopy.add(new TreeBlockCanvas.Vec(position.getBlockX(), position.getBlockY(), position.getBlockZ()));
}
}
IrisBlockVector root = placed.get(0);
roots.add(new TreeGrounding.Root(root.getBlockX(), -(height / 2), root.getBlockZ(), state("minecraft:oak_log[axis=y]")));
object.setTreeGrounding(TreeGrounding.create(roots, 4, canopy));
}
return object;
}
private static IrisObjectRotation rotation(IrisAxisRotationClamp x, IrisAxisRotationClamp y, IrisAxisRotationClamp z) {
IrisObjectRotation rotation = new IrisObjectRotation();
rotation.setEnabled(true);
rotation.setXAxis(x);
rotation.setYAxis(y);
rotation.setZAxis(z);
return rotation;
}
private GoldenState state(String raw) {
String key = raw.toLowerCase();
if (key.indexOf(':') < 0) {
key = "minecraft:" + key;
}
return states.computeIfAbsent(key, GoldenState::new);
}
private NativeBlockState mergeStates(NativeBlockState base, NativeBlockState update) {
GoldenState left = (GoldenState) base;
GoldenState right = (GoldenState) update;
if (!left.material.equals(right.material)) {
return update;
}
LinkedHashMap<String, String> merged = new LinkedHashMap<>(left.properties);
merged.putAll(right.properties);
return state(GoldenState.compose(left.material, merged));
}
private static NativeBlockState rotateState(IrisObjectRotation rotation, NativeBlockState state, int spinX, int spinY, int spinZ) {
if (state == null || !rotation.canRotate()) {
return state;
}
GoldenState golden = (GoldenState) state;
String facing = golden.properties.get("facing");
if (facing != null) {
IrisBlockVector vector = switch (facing) {
case "north" -> new IrisBlockVector(0, 0, -1);
case "south" -> new IrisBlockVector(0, 0, 1);
case "east" -> new IrisBlockVector(1, 0, 0);
case "west" -> new IrisBlockVector(-1, 0, 0);
case "up" -> new IrisBlockVector(0, 1, 0);
default -> new IrisBlockVector(0, -1, 0);
};
IrisBlockVector rotated = rotation.rotate(vector, spinX, spinY, spinZ);
String face = faceName(rotated);
if (face.equals("up") || face.equals("down")) {
return golden.material.endsWith("_stairs") ? null : state;
}
return face.equals(facing) ? state : golden.with("facing", face);
}
String axis = golden.properties.get("axis");
if (axis != null) {
IrisBlockVector vector = switch (axis) {
case "x" -> new IrisBlockVector(1, 0, 0);
case "y" -> new IrisBlockVector(0, 1, 0);
default -> new IrisBlockVector(0, 0, 1);
};
IrisBlockVector rotated = rotation.rotate(vector, spinX, spinY, spinZ);
double ax = Math.abs(rotated.getX());
double ay = Math.abs(rotated.getY());
double az = Math.abs(rotated.getZ());
String result = ax >= ay && ax >= az ? "x" : ay >= az ? "y" : "z";
return result.equals(axis) ? state : golden.with("axis", result);
}
return state;
}
private static String faceName(IrisBlockVector vector) {
double ax = Math.abs(vector.getX());
double ay = Math.abs(vector.getY());
double az = Math.abs(vector.getZ());
if (ay >= ax && ay >= az) {
return vector.getY() > 0 ? "up" : "down";
}
if (ax >= az) {
return vector.getX() > 0 ? "east" : "west";
}
return vector.getZ() > 0 ? "south" : "north";
}
private final class GoldenState implements NativeBlockState {
private final String key;
private final String material;
private final LinkedHashMap<String, String> properties;
private GoldenState(String key) {
this.key = key;
int bracket = key.indexOf('[');
this.material = bracket < 0 ? key : key.substring(0, bracket);
this.properties = new LinkedHashMap<>();
if (bracket >= 0) {
for (String part : key.substring(bracket + 1, key.length() - 1).split(",")) {
int split = part.indexOf('=');
properties.put(part.substring(0, split), part.substring(split + 1));
}
}
}
private static String compose(String material, Map<String, String> properties) {
if (properties.isEmpty()) {
return material;
}
StringBuilder builder = new StringBuilder(material).append('[');
boolean first = true;
for (Map.Entry<String, String> entry : properties.entrySet()) {
if (!first) {
builder.append(',');
}
builder.append(entry.getKey()).append('=').append(entry.getValue());
first = false;
}
return builder.append(']').toString();
}
private GoldenState with(String name, String value) {
LinkedHashMap<String, String> updated = new LinkedHashMap<>(properties);
updated.put(name, value);
return state(compose(material, updated));
}
@Override
public String key() {
return key;
}
@Override
public String namespace() {
return "minecraft";
}
@Override
public boolean isAir() {
return material.endsWith("air");
}
@Override
public boolean isSolid() {
return !isAir() && !isFluid() && !isVineBlock() && !material.equals("minecraft:lantern");
}
@Override
public boolean isOccluding() {
return material.equals("minecraft:stone") || material.equals("minecraft:dirt")
|| material.equals("minecraft:grass_block") || material.equals("minecraft:oak_log")
|| material.equals("minecraft:cobblestone") || material.equals("minecraft:oak_slab");
}
@Override
public boolean isCustom() {
return false;
}
@Override
public boolean isFluid() {
return material.equals("minecraft:water");
}
@Override
public boolean isWater() {
return isFluid();
}
@Override
public boolean isWaterLogged() {
return "true".equals(properties.get("waterlogged"));
}
@Override
public boolean isLit() {
return false;
}
@Override
public boolean isUpdatable() {
return material.endsWith("_stairs");
}
@Override
public boolean isFoliage() {
return false;
}
@Override
public boolean isTreeBlock() {
return material.endsWith("_log") || material.endsWith("_leaves");
}
@Override
public boolean isFoliagePlantable() {
return material.equals("minecraft:grass_block") || material.equals("minecraft:dirt");
}
@Override
public boolean isDecorant() {
return false;
}
@Override
public boolean isStorage() {
return material.equals("minecraft:chest");
}
@Override
public boolean isStorageChest() {
return isStorage();
}
@Override
public boolean isOre() {
return false;
}
@Override
public boolean isDeepSlate() {
return false;
}
@Override
public boolean isVineBlock() {
return material.equals("minecraft:vine");
}
@Override
public boolean canPlaceOnto(NativeBlockState onto) {
return onto != null && onto.isSolid();
}
@Override
public boolean matches(NativeBlockState state) {
if (!(state instanceof GoldenState other) || !other.material.equals(material)) {
return false;
}
for (Map.Entry<String, String> entry : other.properties.entrySet()) {
if (!entry.getValue().equals(properties.get(entry.getKey()))) {
return false;
}
}
return true;
}
@Override
public boolean hasTileEntity() {
return isStorage();
}
@Override
public NativeBlockState withProperty(String name, String value) {
return with(name, value);
}
@Override
public Object nativeHandle() {
return key;
}
@Override
public String toString() {
return key;
}
}
private final class GoldenPlacer implements IObjectPlacer {
private final Engine engine;
private final boolean preventDecay;
private final Map<Long, NativeBlockState> blocks = new HashMap<>();
private final Map<Long, Map<Class<?>, Object>> extra = new HashMap<>();
private long hash = 31L;
private int writes;
private int markerWrites;
private GoldenPlacer(Engine engine, boolean preventDecay) {
this.engine = engine;
this.preventDecay = preventDecay;
}
private static long key(int x, int y, int z) {
return (((long) x & 0x3FFFFFL) << 42) | (((long) y & 0xFFFFFL) << 22) | ((long) z & 0x3FFFFFL);
}
private int surface(int x, int z) {
return 64 + Math.floorMod(x * 31 + z * 17, 9) - 4;
}
private void record(String kind, int x, int y, int z, String value) {
writes++;
hash = mix(hash, kind.hashCode());
hash = mix(hash, x);
hash = mix(hash, y);
hash = mix(hash, z);
hash = mix(hash, value.hashCode());
}
@Override
public int getHighest(int x, int z, IrisData data) {
return surface(x, z);
}
@Override
public int getHighest(int x, int z, IrisData data, boolean ignoreFluid) {
return ignoreFluid ? surface(x, z) : Math.max(surface(x, z), 62);
}
@Override
public void set(int x, int y, int z, NativeBlockState d) {
record("set", x, y, z, d == null ? "null" : d.key());
blocks.put(key(x, y, z), d);
}
@Override
public NativeBlockState get(int x, int y, int z) {
NativeBlockState written = blocks.get(key(x, y, z));
if (written != null) {
return written;
}
int surface = surface(x, z);
if (y <= surface) {
return state(y == surface ? "minecraft:grass_block[snowy=false]" : "minecraft:stone");
}
if (y <= 62) {
return state("minecraft:water");
}
return Math.floorMod(x + y + z, 13) == 0 ? state("minecraft:oak_leaves[distance=1,persistent=true,waterlogged=true]") : null;
}
@Override
public boolean isPreventingDecay() {
return preventDecay;
}
@Override
public boolean isCarved(int x, int y, int z) {
return Math.floorMod(x * 7 + y * 3 + z * 11, 29) == 0;
}
@Override
public boolean isSolid(int x, int y, int z) {
NativeBlockState state = get(x, y, z);
return state != null && state.isSolid();
}
@Override
public boolean isUnderwater(int x, int z) {
return surface(x, z) < 62;
}
@Override
public int getFluidHeight() {
return 62;
}
@Override
public int getFluidHeight(int x, int z) {
return 62;
}
@Override
public boolean isDebugSmartBore() {
return false;
}
@Override
public void setTile(int xx, int yy, int zz, TileData tile) {
record("tile", xx, yy, zz, tile == null ? "null" : "tile");
}
@Override
public <T> void setData(int xx, int yy, int zz, T value) {
record("data", xx, yy, zz, value == null ? "null" : value.getClass().getSimpleName() + ":" + value);
if (value instanceof MatterMarker) {
markerWrites++;
}
extra.computeIfAbsent(key(xx, yy, zz), ignored -> new HashMap<>()).put(value == null ? Object.class : value.getClass(), value);
}
@Override
public <T> T getData(int xx, int yy, int zz, Class<T> type) {
Map<Class<?>, Object> values = extra.get(key(xx, yy, zz));
Object value = values == null ? null : values.get(type);
return value == null ? null : type.cast(value);
}
@Override
public boolean beginTreeCanopy(BlockPosition position) {
boolean open = IObjectPlacer.super.beginTreeCanopy(position);
record("canopy", position.getX(), position.getY(), position.getZ(), Boolean.toString(open));
return open;
}
@Override
public Engine getEngine() {
return engine;
}
}
}