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

World Changes

Browse Source
This commit is contained in:
Brian Neumann-Fopiano
2026-07-12 17:06:30 -04:00
parent e42ab6fae6
commit cd05fd1bca
58 changed files with 668 additions and 313 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adapters/modded-common/src/main/java/art/arcane/iris/modded/ModdedParityProbe.java
+1
View File
@@ -133,6 +133,7 @@ public final class ModdedParityProbe {
}
IrisWorld world = IrisWorld.builder()
.platformIdentity("iris:parity")
.name("parity")
.seed(SEED)
.worldFolder(new File(workRoot, "world"))
adapters/modded-common/src/main/java/art/arcane/iris/modded/ModdedWorldEngines.java
+1
View File
@@ -84,6 +84,7 @@ public final class ModdedWorldEngines {
long seed = seedOverride == Long.MIN_VALUE ? level.getSeed() : seedOverride;
File worldFolder = DimensionType.getStorageFolder(level.dimension(), level.getServer().getWorldPath(LevelResource.ROOT)).toFile();
IrisWorld world = IrisWorld.builder()
.platformIdentity(level.dimension().identifier().toString())
.name(level.dimension().identifier().toString().replace(':', '_'))
.seed(seed)
.worldFolder(worldFolder)
adapters/modded-common/src/main/java/art/arcane/iris/modded/ModdedWorldManager.java
+1 -1
View File
@@ -641,7 +641,7 @@ public final class ModdedWorldManager implements EngineWorldManager {
private boolean isPregenActive() {
PregeneratorJob job = PregeneratorJob.getInstance();
return job != null && job.targetsWorldName(engine.getWorld().name());
return job != null && job.targetsWorldIdentity(engine.getWorld().identity());
}
private static boolean markerSystemEnabled() {
adapters/modded-common/src/main/java/art/arcane/iris/modded/command/ModdedRegen.java
+3 -3
View File
@@ -106,8 +106,8 @@ public final class ModdedRegen {
private void run() {
long startedAt = M.ms();
String worldName = engine.getWorld() == null ? null : engine.getWorld().name();
WorldMaintenance.beginWorldMaintenance(worldName, "regen");
String worldIdentity = engine.getWorld() == null ? null : engine.getWorld().identity();
WorldMaintenance.beginWorldMaintenance(worldIdentity, "regen");
try {
resetMantleMargin();
List<int[]> targets = ChunkSpiral.centerOut(centerX, centerZ, radius);
@@ -120,7 +120,7 @@ public final class ModdedRegen {
LOGGER.error("Iris regen failed", e);
fail("Regen failed: " + e);
} finally {
WorldMaintenance.endWorldMaintenance(worldName, "regen");
WorldMaintenance.endWorldMaintenance(worldIdentity, "regen");
ACTIVE.set(false);
}
}
adapters/modded-common/src/main/java/art/arcane/iris/modded/service/ModdedChunkUpdateService.java
+1 -1
View File
@@ -127,7 +127,7 @@ public final class ModdedChunkUpdateService implements ModdedTickableService {
private boolean isPregenActive(Engine engine) {
PregeneratorJob job = PregeneratorJob.getInstance();
return job != null && job.targetsWorldName(engine.getWorld().name());
return job != null && job.targetsWorldIdentity(engine.getWorld().identity());
}
private void updateNearPlayers(Engine engine, ServerLevel level) {
adapters/modded-common/src/main/java/art/arcane/iris/modded/service/ModdedEngineMaintenanceService.java
+2 -2
View File
@@ -169,7 +169,7 @@ public final class ModdedEngineMaintenanceService implements ModdedTickableServi
}
private boolean shouldSkipForMaintenance(Engine engine) {
if (engine.getWorld() == null || !WorldMaintenance.isWorldMaintenanceActive(engine.getWorld().name())) {
if (engine.getWorld() == null || !WorldMaintenance.isWorldMaintenanceActive(engine.getWorld().identity())) {
return false;
}
return !pregenTargets(engine);
@@ -180,7 +180,7 @@ public final class ModdedEngineMaintenanceService implements ModdedTickableServi
return false;
}
PregeneratorJob job = PregeneratorJob.getInstance();
return job != null && job.targetsWorldName(engine.getWorld().name());
return job != null && job.targetsWorldIdentity(engine.getWorld().identity());
}
private int activeTectonicLimit(Engine engine, int share) {
adapters/modded-common/src/main/java/art/arcane/iris/modded/service/ModdedStudioHotloadService.java
+1 -1
View File
@@ -139,7 +139,7 @@ public final class ModdedStudioHotloadService implements ModdedTickableService {
return true;
}
PregeneratorJob job = PregeneratorJob.getInstance();
return job != null && job.targetsWorldName(engine.getWorld().name());
return job != null && job.targetsWorldIdentity(engine.getWorld().identity());
}
private void poll(String dimensionId, Watch watch, IrisModdedChunkGenerator generator, Engine engine) {