mirrors/Iris
1
0 Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2026-10-27 14:30:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Propagated engine failures

Browse Source 
- GenerationClosedException covers closed history routers, stages, saved biome runtimes and admissions
- It also covers ownership stores, hydrology caches and engine runtimes
- GenerationFailures tells engine, lifecycle, executor and JVM failures from content failures
- Engine failures rethrow from object, cave object, procedural, floating, upper and decorator catch sites
- Biome layer, noise bound, rotation and mantle write catch sites rethrow them too
- Only content failures are skipped
- A source plan is never cached or persisted without an object a healthy engine places
- A transient engine failure no longer turns imported features off
This commit is contained in:
Brian Neumann-Fopiano committed 2026-09-29 06:50:23 -04:00
1 parent 76a07242b5
commit 54f3595ba7
22 files changed
+357 -16
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

core/src/main/java/art/arcane/iris/generation/biome/IrisBiomeLayerGenerator.java
+3
View File
@@ -24,6 +24,7 @@ import art.arcane.iris.structure.object.IrisObject;
import art.arcane.iris.structure.object.IrisObjectPlacement;
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.Engine;
import art.arcane.iris.spi.IrisLogging;
@@ -233,6 +234,7 @@ final class IrisBiomeLayerGenerator {
data.add(layer.get(random, layerIndex + offset,
(wx + offset) / zoom, offset, (wz - offset) / zoom, rdata));
} catch (Throwable error) {
GenerationFailures.rethrowEngineFailure(error);
IrisLogging.reportError(error);
}
}
@@ -330,6 +332,7 @@ final class IrisBiomeLayerGenerator {
blocks.add(layer.get(random, layerIndex + offset,
(x + offset) / zoom, offset, (z - offset) / zoom, data));
} catch (Throwable error) {
GenerationFailures.rethrowEngineFailure(error);
IrisLogging.reportError(error);
}
}
core/src/main/java/art/arcane/iris/generation/decoration/DecoratorCore.java
+4
View File
@@ -18,6 +18,7 @@
package art.arcane.iris.generation.decoration;
import art.arcane.iris.generation.runtime.GenerationFailures;
import art.arcane.iris.pack.loading.IrisData;
import art.arcane.iris.generation.mantle.EngineMantle;
import art.arcane.iris.generation.biome.IrisBiome;
@@ -89,6 +90,7 @@ final class DecoratorCore {
}
}
} catch (Throwable e) {
GenerationFailures.rethrowEngineFailure(e);
IrisLogging.reportError(e);
}
}
@@ -163,6 +165,7 @@ final class DecoratorCore {
data.set(x, lowerY, z, lower);
data.set(x, upperY, z, upper);
} catch (Throwable e) {
GenerationFailures.rethrowEngineFailure(e);
IrisLogging.reportError(e);
}
return;
@@ -356,6 +359,7 @@ final class DecoratorCore {
data.set(xf, lowerY, zf, lower);
data.set(xf, upperY, zf, upper);
} catch (Throwable e) {
GenerationFailures.rethrowEngineFailure(e);
IrisLogging.reportError(e);
}
return;
core/src/main/java/art/arcane/iris/generation/hydrology/HydrologyTileCache.java
+2 -1
View File
@@ -1,5 +1,6 @@
package art.arcane.iris.generation.hydrology;
import art.arcane.iris.generation.runtime.GenerationClosedException;
import art.arcane.iris.spi.IrisLogging;
import art.arcane.iris.generation.concurrent.MultiBurst;
import art.arcane.iris.generation.stream.ProvisionalSampling;
@@ -713,7 +714,7 @@ public final class HydrologyTileCache implements AutoCloseable {
public void enableSharedCache(SharedCacheScope scope, Path persistentRoot) {
if (closed.get()) {
throw new IllegalStateException("Hydrology tile cache is closed.");
throw new GenerationClosedException("Hydrology tile cache is closed.");
}
sharedCacheScope = Objects.requireNonNull(scope, "scope");
persistentStore = persistentRoot == null
core/src/main/java/art/arcane/iris/generation/mantle/MantleFloatingObjectComponent.java
+7
View File
@@ -20,6 +20,7 @@ package art.arcane.iris.generation.mantle;
import java.io.UncheckedIOException;
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.cache.Cache;
import art.arcane.iris.generation.biome.FloatingIslandSample;
@@ -231,6 +232,7 @@ public class MantleFloatingObjectComponent extends IrisMantleComponent {
throw failure;
} catch (Throwable e) {
transaction.discard();
GenerationFailures.rethrowEngineFailure(e);
IrisLogging.reportError(e);
}
}
@@ -326,6 +328,7 @@ public class MantleFloatingObjectComponent extends IrisMantleComponent {
throw failure;
} catch (Throwable e) {
transaction.discard();
GenerationFailures.rethrowEngineFailure(e);
IrisLogging.reportError(e);
}
}
@@ -438,6 +441,7 @@ public class MantleFloatingObjectComponent extends IrisMantleComponent {
throw failure;
} catch (Throwable e) {
transaction.discard();
GenerationFailures.rethrowEngineFailure(e);
IrisLogging.reportError(e);
}
}
@@ -611,11 +615,13 @@ public class MantleFloatingObjectComponent extends IrisMantleComponent {
maxObjectExtent = Math.max(maxObjectExtent, computePlacementRadius(entry.resolveBottomObjects(target), data, sizeCache, warnedLargeObjects));
}
} catch (Throwable e) {
GenerationFailures.rethrowEngineFailure(e);
IrisLogging.reportError(e);
}
}
}
} catch (Throwable e) {
GenerationFailures.rethrowEngineFailure(e);
IrisLogging.reportError(e);
}
return maxObjectExtent;
@@ -649,6 +655,7 @@ public class MantleFloatingObjectComponent extends IrisMantleComponent {
}
radius = Math.max(radius, reach);
} catch (Throwable e) {
GenerationFailures.rethrowEngineFailure(e);
IrisLogging.reportError(e);
}
}
core/src/main/java/art/arcane/iris/generation/mantle/MantleObjectComponent.java
+11
View File
@@ -22,6 +22,7 @@ package art.arcane.iris.generation.mantle;
import art.arcane.iris.configuration.IrisSettings;
import art.arcane.iris.generation.block.B;
import art.arcane.iris.generation.cache.Cache;
import art.arcane.iris.generation.runtime.GenerationFailures;
import art.arcane.iris.generation.runtime.IrisComplex;
import art.arcane.iris.generation.runtime.UpperDimensionContext;
import art.arcane.iris.generation.runtime.Engine;
@@ -475,6 +476,7 @@ public class MantleObjectComponent extends IrisMantleComponent {
nullObjects += result.nullObjects();
errors += result.errors();
} catch (Throwable e) {
GenerationFailures.rethrowEngineFailure(e);
errors++;
IrisLogging.reportError(e);
IrisLogging.error("Failed to place objects in the following biome: " + surfaceBiome.getName());
@@ -508,6 +510,7 @@ public class MantleObjectComponent extends IrisMantleComponent {
nullObjects += result.nullObjects();
errors += result.errors();
} catch (Throwable e) {
GenerationFailures.rethrowEngineFailure(e);
errors++;
IrisLogging.reportError(e);
IrisLogging.error("Failed to place cave objects in the following biome: " + caveBiome.getName());
@@ -538,6 +541,7 @@ public class MantleObjectComponent extends IrisMantleComponent {
nullObjects += result.nullObjects();
errors += result.errors();
} catch (Throwable e) {
GenerationFailures.rethrowEngineFailure(e);
errors++;
IrisLogging.reportError(e);
IrisLogging.error("Failed to place objects in the following region: " + region.getName());
@@ -571,6 +575,7 @@ public class MantleObjectComponent extends IrisMantleComponent {
nullObjects += result.nullObjects();
errors += result.errors();
} catch (Throwable e) {
GenerationFailures.rethrowEngineFailure(e);
errors++;
IrisLogging.reportError(e);
IrisLogging.error("Failed to place cave objects in the following region: " + region.getName());
@@ -760,6 +765,7 @@ public class MantleObjectComponent extends IrisMantleComponent {
+ " commit=" + commitResult);
}
} catch (Throwable e) {
GenerationFailures.rethrowEngineFailure(e);
IrisLogging.reportError(e);
IrisLogging.error("Failed to place procedural object '" + p.getName() + "' in " + scope);
}
@@ -988,6 +994,7 @@ public class MantleObjectComponent extends IrisMantleComponent {
+ " density=" + density);
}
} catch (Throwable e) {
GenerationFailures.rethrowEngineFailure(e);
errors++;
IrisLogging.reportError(e);
IrisLogging.error("Regen object placement exception: chunk=" + chunkX + "," + chunkZ
@@ -1192,6 +1199,7 @@ public class MantleObjectComponent extends IrisMantleComponent {
+ " density=" + density);
}
} catch (Throwable e) {
GenerationFailures.rethrowEngineFailure(e);
errors++;
IrisLogging.reportError(e);
IrisLogging.error("Regen cave object placement exception: chunk=" + metricChunkX + "," + metricChunkZ
@@ -1251,6 +1259,7 @@ public class MantleObjectComponent extends IrisMantleComponent {
try {
placeUpperObject(writer, rng, chunkX, chunkZ, i, upperCtx, complex, forcePlace, traceRegen, "upper-biome-surface");
} catch (Throwable e) {
GenerationFailures.rethrowEngineFailure(e);
IrisLogging.reportError(e);
IrisLogging.error("Failed to place upper-dimension objects in biome " + upperBiome.getName()
+ ": " + i.getPlace().toString(", ") + " (" + e.getClass().getSimpleName() + ")");
@@ -1266,6 +1275,7 @@ public class MantleObjectComponent extends IrisMantleComponent {
try {
placeUpperObject(writer, rng, chunkX, chunkZ, i, upperCtx, complex, forcePlace, traceRegen, "upper-region-surface");
} catch (Throwable e) {
GenerationFailures.rethrowEngineFailure(e);
IrisLogging.reportError(e);
IrisLogging.error("Failed to place upper-dimension objects in region " + upperRegion.getName()
+ ": " + i.getPlace().toString(", ") + " (" + e.getClass().getSimpleName() + ")");
@@ -1790,6 +1800,7 @@ public class MantleObjectComponent extends IrisMantleComponent {
}
radius = Math.max(radius, reach);
} catch (Throwable e) {
GenerationFailures.rethrowEngineFailure(e);
IrisLogging.reportError(e);
}
}
core/src/main/java/art/arcane/iris/generation/mantle/MantleWriter.java
+2
View File
@@ -29,6 +29,7 @@ import art.arcane.iris.integration.Identifier;
import art.arcane.iris.world.WorldMaintenance;
import art.arcane.iris.pack.loading.IrisData;
import art.arcane.iris.generation.runtime.Engine;
import art.arcane.iris.generation.runtime.GenerationFailures;
import art.arcane.iris.generation.runtime.IrisComplex;
import art.arcane.iris.generation.terrain.Terrain3DColumn;
import art.arcane.iris.world.history.TransitionGenerationPlan;
@@ -1495,6 +1496,7 @@ public class MantleWriter implements ObjectPassPlacer, AutoCloseable {
try {
setData(pos.getX(), pos.getY(), pos.getZ(), data);
} catch (Throwable e) {
GenerationFailures.rethrowEngineFailure(e);
// Reached per position while an object writes past the edge of the writer window, which is
// how a large object is clipped. Nothing here is actionable from outside the engine.
IrisLogging.debug("No set? " + data.toString() + " for " + pos.toString());
core/src/main/java/art/arcane/iris/generation/runtime/DimensionTerrainContext.java
+1
View File
@@ -335,6 +335,7 @@ public final class DimensionTerrainContext implements DataProvider {
}
return new NoiseBounds(minimum, maximum);
} catch (Throwable e) {
GenerationFailures.rethrowEngineFailure(e);
IrisLogging.reportError(e);
return ZERO_NOISE_BOUNDS;
}
core/src/main/java/art/arcane/iris/generation/runtime/GenerationClosedException.java
+7
View File
@@ -0,0 +1,7 @@
package art.arcane.iris.generation.runtime;
public final class GenerationClosedException extends IllegalStateException {
public GenerationClosedException(String message) {
super(message);
}
}
core/src/main/java/art/arcane/iris/generation/runtime/GenerationFailures.java
+62
View File
@@ -0,0 +1,62 @@
package art.arcane.iris.generation.runtime;
import art.arcane.iris.world.history.SavedBiomeUnavailableException;
import art.arcane.volmlib.util.mantle.MantleClosedException;
import java.io.InterruptedIOException;
import java.nio.channels.ClosedChannelException;
import java.util.concurrent.CancellationException;
import java.util.concurrent.RejectedExecutionException;
import java.util.concurrent.TimeoutException;
/**
* Separates failures of the engine, its mantle, generation history, executors or the JVM from failures of one
* piece of content. Content loops (objects, decorators, layers) may skip a failed item because every rebuild
* skips it the same way. An engine failure is transient, so skipping would cache and persist terrain that a
* healthy engine never produces: it must fail the whole chunk instead.
*/
public final class GenerationFailures {
private static final int MAXIMUM_CAUSE_DEPTH = 32;
private GenerationFailures() {
}
public static boolean isEngineFailure(Throwable failure) {
if (Thread.currentThread().isInterrupted()) {
return true;
}
Throwable current = failure;
for (int depth = 0; current != null && depth < MAXIMUM_CAUSE_DEPTH; depth++, current = current.getCause()) {
if (current instanceof Error
|| current instanceof GenerationClosedException
|| current instanceof MantleClosedException
|| current instanceof WrongEngineBroException
|| current instanceof SavedBiomeUnavailableException
|| current instanceof InterruptedException
|| current instanceof InterruptedIOException
|| current instanceof ClosedChannelException
|| current instanceof RejectedExecutionException
|| current instanceof CancellationException
|| current instanceof TimeoutException) {
return true;
}
}
return false;
}
public static void rethrowEngineFailure(Throwable failure) {
if (!isEngineFailure(failure)) {
return;
}
if (failure instanceof RuntimeException runtimeFailure) {
throw runtimeFailure;
}
if (failure instanceof Error error) {
throw error;
}
if (failure instanceof InterruptedException) {
Thread.currentThread().interrupt();
}
throw new IllegalStateException("Iris generation stopped: " + failure, failure);
}
}
core/src/main/java/art/arcane/iris/generation/runtime/IrisComplex.java
+1
View File
@@ -2044,6 +2044,7 @@ public class IrisComplex implements DataProvider {
GeneratorBounds bounds = complex.resolveGeneratorBounds(engine, generators, bx, cachedBounds, localBounds);
return bounds.noiseBounds;
} catch (Throwable e) {
GenerationFailures.rethrowEngineFailure(e);
long now = System.currentTimeMillis();
long last = lastBoundsFailureLog.get();
// The five second gate keeps this off the hot path; the once key keeps it out of a log
core/src/main/java/art/arcane/iris/generation/runtime/IrisEngine.java
+3 -3
View File
@@ -1083,10 +1083,10 @@ public class IrisEngine implements Engine {
throw new IllegalArgumentException("Generation runtime binding belongs to a different Iris engine.");
}
if (retiringGenerationRuntimes.contains(required.runtime)) {
throw new IllegalStateException("Iris generation runtime binding is retiring.");
throw new GenerationClosedException("Iris generation runtime binding is retiring.");
}
if (!isGenerationRuntimeBindingLive(required)) {
throw new IllegalStateException("Iris generation runtime binding is closed or no longer owned.");
throw new GenerationClosedException("Iris generation runtime binding is closed or no longer owned.");
}
return threadState.open(required);
}
@@ -1682,7 +1682,7 @@ public class IrisEngine implements Engine {
void requireRunning(String operation) {
if (closed || closing.get() || lifecycleState != LifecycleState.RUNNING || runtime == null) {
throw new IllegalStateException("Cannot " + operation + " while Iris engine " + getWorld().name()
throw new GenerationClosedException("Cannot " + operation + " while Iris engine " + getWorld().name()
+ " is " + lifecycleState.name().toLowerCase() + ".");
}
}
core/src/main/java/art/arcane/iris/generation/stage/IrisFloatingChildBiomeModifier.java
+5
View File
@@ -21,6 +21,7 @@ package art.arcane.iris.generation.stage;
import art.arcane.iris.pack.loading.IrisData;
import art.arcane.iris.generation.runtime.DimensionStackLayout;
import art.arcane.iris.generation.runtime.GenerationFailures;
import art.arcane.iris.generation.runtime.IrisComplex;
import art.arcane.iris.generation.decoration.FloatingDecorator;
import art.arcane.iris.generation.decoration.IrisSeaSurfaceDecorator;
@@ -100,6 +101,7 @@ public class IrisFloatingChildBiomeModifier extends EngineAssignedModifier<Nativ
try {
generated.add(layer.get(random.nextParallelRNG(i + j), (wx + j) / layer.getZoom(), j, (wz - j) / layer.getZoom(), data));
} catch (Throwable e) {
GenerationFailures.rethrowEngineFailure(e);
IrisLogging.reportError(e);
}
}
@@ -345,6 +347,7 @@ public class IrisFloatingChildBiomeModifier extends EngineAssignedModifier<Nativ
RNG colRng = rng.nextParallelRNG((int) FloatingIslandSample.columnSeed(baseSeed, wx, wz));
FloatingDecorator.decorateColumn(getEngine(), target, IrisDecorationPart.NONE, xf, zf, wx, wz, topY, max, output, colRng, NOOP_DECORATION_MISS);
} catch (Throwable e) {
GenerationFailures.rethrowEngineFailure(e);
IrisLogging.reportError(e);
}
}
@@ -377,6 +380,7 @@ public class IrisFloatingChildBiomeModifier extends EngineAssignedModifier<Nativ
try {
seaSurfaceDecorator.decorate(xf, zf, wx, wx + 1, wx - 1, wz, wz + 1, wz - 1, output, target, fluidTopY, chunkHeight);
} catch (Throwable e) {
GenerationFailures.rethrowEngineFailure(e);
IrisLogging.reportError(e);
}
}
@@ -432,6 +436,7 @@ public class IrisFloatingChildBiomeModifier extends EngineAssignedModifier<Nativ
context.floatingBiomes(chunkHeight).record(wx & 15, y, wz & 15, matter.identity());
}
} catch (Throwable e) {
GenerationFailures.rethrowEngineFailure(e);
IrisLogging.reportError(e);
}
}
core/src/main/java/art/arcane/iris/structure/nativegen/NativeStructureOwnershipStore.java
+3 -2
View File
@@ -1,6 +1,7 @@
package art.arcane.iris.structure.nativegen;
import art.arcane.iris.generation.runtime.Engine;
import art.arcane.iris.generation.runtime.GenerationClosedException;
import art.arcane.iris.generation.runtime.IrisEngine;
import art.arcane.iris.world.history.GenerationHistoryRuntimeRouter;
@@ -165,7 +166,7 @@ public final class NativeStructureOwnershipStore {
lifecycleLock.writeLock().lock();
try {
if (closed) {
throw new IllegalStateException("Native structure ownership store is closed");
throw new GenerationClosedException("Native structure ownership store is closed");
}
flushDirty();
} finally {
@@ -214,7 +215,7 @@ public final class NativeStructureOwnershipStore {
private void requireOpen() {
engine();
if (closed) {
throw new IllegalStateException("Native structure ownership store is closed");
throw new GenerationClosedException("Native structure ownership store is closed");
}
}
core/src/main/java/art/arcane/iris/structure/object/IrisObjectPlacementRunner.java
+3
View File
@@ -29,6 +29,7 @@ import art.arcane.iris.generation.decoration.IrisVacuumSettings;
import art.arcane.iris.world.entity.IrisMarker;
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.Engine;
import art.arcane.volmlib.nativelib.terrain.structure.NativeStructureVolume;
@@ -519,6 +520,7 @@ final class IrisObjectPlacementRunner {
tile = states.get(g);
}
} 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() + " (cme)");
d = IrisObject.States.air();
@@ -713,6 +715,7 @@ final class IrisObjectPlacementRunner {
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();
core/src/main/java/art/arcane/iris/structure/object/IrisObjectRotation.java
+2
View File
@@ -18,6 +18,7 @@
package art.arcane.iris.structure.object;
import art.arcane.iris.generation.runtime.GenerationFailures;
import art.arcane.iris.pack.value.IrisDirection;
import art.arcane.iris.pack.value.IrisPosition;
@@ -450,6 +451,7 @@ public class IrisObjectRotation {
}
}
} catch (Throwable e) {
GenerationFailures.rethrowEngineFailure(e);
IrisLogging.reportError(e);
}
core/src/main/java/art/arcane/iris/world/history/GenerationAdmission.java
+3 -1
View File
@@ -1,5 +1,7 @@
package art.arcane.iris.world.history;
import art.arcane.iris.generation.runtime.GenerationClosedException;
import java.nio.file.Path;
import java.util.Objects;
import java.util.concurrent.ConcurrentHashMap;
@@ -137,7 +139,7 @@ public final class GenerationAdmission {
private void requireOpen() {
if (closed) {
throw new IllegalStateException("Generation admission belongs to a closed runtime.");
throw new GenerationClosedException("Generation admission belongs to a closed runtime.");
}
}
core/src/main/java/art/arcane/iris/world/history/GenerationHistory.java
+2 -1
View File
@@ -1,5 +1,6 @@
package art.arcane.iris.world.history;
import art.arcane.iris.generation.runtime.GenerationClosedException;
import art.arcane.iris.pack.AtomicDirectoryPublisher;
import art.arcane.iris.world.storage.Durability;
import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap;
@@ -1386,7 +1387,7 @@ public final class GenerationHistory {
throw new IllegalArgumentException("Generation stage belongs to a different history.");
}
if (closed) {
throw new IllegalStateException("Generation stage is closed.");
throw new GenerationClosedException("Generation stage is closed.");
}
}
}
core/src/main/java/art/arcane/iris/world/history/GenerationHistoryRuntimeRouter.java
+7 -6
View File
@@ -9,6 +9,7 @@ import art.arcane.iris.pack.loading.IrisData;
import art.arcane.iris.generation.runtime.IrisEngine;
import art.arcane.iris.generation.runtime.IrisEngineMantle;
import art.arcane.iris.generation.runtime.EngineTarget;
import art.arcane.iris.generation.runtime.GenerationClosedException;
import art.arcane.iris.generation.runtime.GenerationTransitionGate;
import art.arcane.iris.generation.mantle.ObjectContinuationBundle;
import art.arcane.iris.world.storage.matter.IrisMatterContext;
@@ -749,7 +750,7 @@ public final class GenerationHistoryRuntimeRouter implements AutoCloseable {
throw propagate(entry.failure, "Saved mantle for activation " + entry.activationId + " is unavailable.");
}
if (closed) {
throw new IllegalStateException("Generation-history runtime router is closed.");
throw new GenerationClosedException("Generation-history runtime router is closed.");
}
try {
inactive.await();
@@ -800,7 +801,7 @@ public final class GenerationHistoryRuntimeRouter implements AutoCloseable {
private void awaitRetirementLocked(long activationId) throws IOException {
while (true) {
if (closed) {
throw new IllegalStateException("Generation-history runtime router is closed.");
throw new GenerationClosedException("Generation-history runtime router is closed.");
}
RuntimeRetirement retirement = retiringBindings.get(activationId);
if (retirement == null) {
@@ -1032,7 +1033,7 @@ public final class GenerationHistoryRuntimeRouter implements AutoCloseable {
stateLock.lock();
try {
if (closed) {
throw new IllegalStateException("Generation-history runtime router is closed.");
throw new GenerationClosedException("Generation-history runtime router is closed.");
}
activeOperations++;
operationDepth.set(operationDepth.get() + 1);
@@ -1045,7 +1046,7 @@ public final class GenerationHistoryRuntimeRouter implements AutoCloseable {
stateLock.lock();
try {
if (closed) {
throw new IllegalStateException("Generation-history runtime router is closed.");
throw new GenerationClosedException("Generation-history runtime router is closed.");
}
activeOperations++;
} finally {
@@ -1202,7 +1203,7 @@ public final class GenerationHistoryRuntimeRouter implements AutoCloseable {
public Scope openScope() {
synchronized (this) {
if (closed) {
throw new IllegalStateException("Saved chunk mantle is closed.");
throw new GenerationClosedException("Saved chunk mantle is closed.");
}
activeScopes++;
}
@@ -1535,7 +1536,7 @@ public final class GenerationHistoryRuntimeRouter implements AutoCloseable {
public RuntimeScope openRuntimeScope() {
synchronized (this) {
if (closed) {
throw new IllegalStateException("Generation-history runtime route is closed.");
throw new GenerationClosedException("Generation-history runtime route is closed.");
}
activeScopes++;
}
core/src/main/java/art/arcane/iris/world/history/SavedBiomeRuntime.java
+3 -2
View File
@@ -1,5 +1,6 @@
package art.arcane.iris.world.history;
import art.arcane.iris.generation.runtime.GenerationClosedException;
import art.arcane.iris.pack.loading.IrisData;
import art.arcane.iris.generation.runtime.IrisEngine;
import art.arcane.iris.generation.runtime.BiomeEnvironment;
@@ -365,7 +366,7 @@ public final class SavedBiomeRuntime implements AutoCloseable {
}
if (!refresh) {
if (closed || prepared == null) {
loading.result.completeExceptionally(new IllegalStateException("Saved biome runtime is closed."));
loading.result.completeExceptionally(new GenerationClosedException("Saved biome runtime is closed."));
} else {
loading.result.complete(prepared);
}
@@ -480,7 +481,7 @@ public final class SavedBiomeRuntime implements AutoCloseable {
private void requireOpen() {
if (closed) {
throw new IllegalStateException("Saved biome runtime is closed.");
throw new GenerationClosedException("Saved biome runtime is closed.");
}
}