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

Hydrology Fix, and V+

Browse Source
This commit is contained in:
Brian Neumann-Fopiano committed 2026-09-15 23:01:56 -04:00
1 parent dfb3748059
commit 1e1eaa96aa
137 files changed
+8842 -711
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

adapters/bukkit/plugin/src/main/java/art/arcane/iris/Iris.java
+9 -1
View File
@@ -640,6 +640,7 @@ public class Iris extends VolmitPlugin implements Listener, ReloadAware {
generatorDrainCompleted = false;
deferredShutdownGenerators.clear();
MultiBurst.burst.reopen();
MultiBurst.hydrology.reopen();
MultiBurst.ioBurst.reopen();
IrisLanguage.initialize();
debugDump = BukkitDebugDump.create(this, new BukkitDebugDump.Options(
@@ -1106,6 +1107,12 @@ public class Iris extends VolmitPlugin implements Listener, ReloadAware {
runtimeTeardownFailed.set(true);
Iris.reportError("Failed to close Iris generation workers.", failure);
}
try {
MultiBurst.hydrology.close();
} catch (Throwable failure) {
runtimeTeardownFailed.set(true);
Iris.reportError("Failed to close Iris hydrology workers.", failure);
}
try {
MultiBurst.ioBurst.close();
} catch (Throwable failure) {
@@ -1273,7 +1280,8 @@ public class Iris extends VolmitPlugin implements Listener, ReloadAware {
}
private boolean hasActiveShutdownResources() {
if (!MultiBurst.burst.isTerminated() || !MultiBurst.ioBurst.isTerminated()) {
if (!MultiBurst.burst.isTerminated() || !MultiBurst.hydrology.isTerminated()
|| !MultiBurst.ioBurst.isTerminated()) {
return true;
}
return services != null
adapters/bukkit/plugin/src/main/java/art/arcane/iris/world/PendingWorldReplacementManager.java
+3 -2
View File
@@ -176,15 +176,16 @@ public final class PendingWorldReplacementManager implements Listener {
seedSelection
);
progress.stage(RuntimeProgressMessages.WORLD_REPLACE_STAGE_PACK);
IrisDimension installed = Iris.service(StudioSVC.class).installIntoWorld(
StudioSVC.GenerationPublication publication = Iris.service(StudioSVC.class).installIntoWorld(
requiredSender,
requiredDimension,
paths.stage().toFile(),
effectiveSeed
);
if (installed == null) {
if (publication == null) {
throw new IOException("Iris could not stage the dimension pack.");
}
IrisDimension installed = publication.dimension();
requireCompatibleEnvironment(target.slotKind(), installed.getEnvironment());
if (target.slotKind() == SlotKind.VANILLA_OVERWORLD) {
progress.stage(RuntimeProgressMessages.WORLD_REPLACE_STAGE_PLAYERS);
adapters/fabric/build.gradle
+1 -1
View File
@@ -59,7 +59,7 @@ apply from: file('../../gradle/modded-generation-build-revision.gradle')
Properties rootProperties = new Properties()
file('../../gradle.properties').withInputStream { InputStream stream -> rootProperties.load(stream) }
String irisVersion = providers.gradleProperty('irisVersion').getOrElse(rootProperties.getProperty('irisVersion', '4.1.0-26.2'))
String irisVersion = providers.gradleProperty('irisVersion').getOrElse(rootProperties.getProperty('irisVersion', '4.1.1-26.2'))
String minecraftVersion = providers.gradleProperty('minecraftVersion').getOrElse(rootProperties.getProperty('minecraftVersion', '26.2'))
String fabricLoaderVersion = providers.gradleProperty('fabricLoaderVersion').getOrElse(rootProperties.getProperty('fabricLoaderVersion', '0.19.3'))
String volmLibCoordinate = providers.gradleProperty('volmLibCoordinate').getOrElse(rootProperties.getProperty('volmLibCoordinate', 'com.github.VolmitSoftware:VolmLib:master-SNAPSHOT'))
adapters/forge/build.gradle
+1 -1
View File
@@ -59,7 +59,7 @@ apply from: file('../../gradle/modded-generation-build-revision.gradle')
Properties rootProperties = new Properties()
file('../../gradle.properties').withInputStream { InputStream stream -> rootProperties.load(stream) }
String irisVersion = providers.gradleProperty('irisVersion').getOrElse(rootProperties.getProperty('irisVersion', '4.1.0-26.2'))
String irisVersion = providers.gradleProperty('irisVersion').getOrElse(rootProperties.getProperty('irisVersion', '4.1.1-26.2'))
String minecraftVersion = providers.gradleProperty('minecraftVersion').getOrElse(rootProperties.getProperty('minecraftVersion', '26.2'))
String forgeVersion = providers.gradleProperty('forgeVersion').getOrElse(rootProperties.getProperty('forgeVersion', '26.2-65.1.1'))
String volmLibCoordinate = providers.gradleProperty('volmLibCoordinate').getOrElse(rootProperties.getProperty('volmLibCoordinate', 'com.github.VolmitSoftware:VolmLib:master-SNAPSHOT'))
adapters/modded-common/src/main/java/art/arcane/iris/modded/ModdedEngineBootstrap.java
+4 -4
View File
@@ -102,6 +102,7 @@ public final class ModdedEngineBootstrap {
// closed, MultiBurst falls back to a same-thread executor, so a second world load
// without reopen() would silently run every burst inline.
MultiBurst.burst.reopen();
MultiBurst.hydrology.reopen();
MultiBurst.ioBurst.reopen();
ModdedScheduler scheduler = schedulerOrNull();
if (scheduler != null) {
@@ -189,10 +190,9 @@ public final class ModdedEngineBootstrap {
failure = runStopStage(failure, "level snapshot", ModdedServerLevels::forget);
}
failure = runStopStage(failure, "generation pool", IrisModdedChunkGenerator::shutdownGenPool);
failure = runStopStage(failure, "burst pools", () -> {
MultiBurst.burst.close();
MultiBurst.ioBurst.close();
});
failure = runStopStage(failure, "generation burst pool", MultiBurst.burst::close);
failure = runStopStage(failure, "hydrology burst pool", MultiBurst.hydrology::close);
failure = runStopStage(failure, "I/O burst pool", MultiBurst.ioBurst::close);
failure = runStopStage(failure, "startup state", ModdedStartup::reset);
failure = runStopStage(failure, "server state", () -> {
currentServer = null;
adapters/neoforge/build.gradle
+1 -1
View File
@@ -59,7 +59,7 @@ apply from: file('../../gradle/modded-generation-build-revision.gradle')
Properties rootProperties = new Properties()
file('../../gradle.properties').withInputStream { InputStream stream -> rootProperties.load(stream) }
String irisVersion = providers.gradleProperty('irisVersion').getOrElse(rootProperties.getProperty('irisVersion', '4.1.0-26.2'))
String irisVersion = providers.gradleProperty('irisVersion').getOrElse(rootProperties.getProperty('irisVersion', '4.1.1-26.2'))
String minecraftVersion = providers.gradleProperty('minecraftVersion').getOrElse(rootProperties.getProperty('minecraftVersion', '26.2'))
String neoForgeVersion = providers.gradleProperty('neoForgeVersion').getOrElse(rootProperties.getProperty('neoForgeVersion', '26.2.0.59'))
String volmLibCoordinate = providers.gradleProperty('volmLibCoordinate').getOrElse(rootProperties.getProperty('volmLibCoordinate', 'com.github.VolmitSoftware:VolmLib:master-SNAPSHOT'))