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

Merge pull request #1234 from VolmitSoftware/dev

Browse Source 
3.8.2
This commit is contained in:
Aidan Aeternum
2026-01-15 02:50:03 -05:00
committed by GitHub
parent 6a89b8bd06 509715087c
commit d2cb8a9032
11 changed files with 87 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/build.gradle.kts
View File

@@ -182,10 +182,14 @@ tasks {
}
val templateSource = file("src/main/templates")
val templateDest = layout.buildDirectory.dir("generated/sources/templates")
val templateDest = layout.buildDirectory.dir("generated/sources/templates")!!
val generateTemplates = tasks.register<Copy>("generateTemplates") {
inputs.properties(
"environment" to if (project.hasProperty("release")) "production" else "development",
"environment" to when {
project.hasProperty("release") -> "production"
project.hasProperty("argghh") -> "Argghh!"
else -> "development"
},
"commit" to provider {
val res = runCatching { project.extensions.getByType<Grgit>().head().id }
res.getOrDefault("")

2
core/src/main/java/com/volmit/iris/core/loader/IrisData.java
View File

@@ -103,7 +103,7 @@ public class IrisData implements ExclusionStrategy, TypeAdapterFactory {
}
public static void dereference() {
dataLoaders.v().forEach(IrisData::cleanupEngine);
dataLoaders.values().forEach(IrisData::cleanupEngine);
}
public static int cacheSize() {

49
core/src/main/java/com/volmit/iris/engine/IrisWorldManager.java
View File

@@ -23,6 +23,7 @@ import com.volmit.iris.core.IrisSettings;
import com.volmit.iris.core.link.Identifier;
import com.volmit.iris.core.loader.IrisData;
import com.volmit.iris.core.service.ExternalDataSVC;
import com.volmit.iris.engine.data.cache.Cache;
import com.volmit.iris.engine.framework.Engine;
import com.volmit.iris.engine.framework.EngineAssignedWorldManager;
import com.volmit.iris.engine.object.*;
@@ -57,13 +58,10 @@ import org.bukkit.event.block.BlockPlaceEvent;
import org.bukkit.event.player.PlayerTeleportEvent;
import org.bukkit.inventory.ItemStack;
import java.lang.ref.WeakReference;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
import java.util.concurrent.*;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.function.Predicate;
import java.util.stream.Collectors;
@@ -81,6 +79,8 @@ public class IrisWorldManager extends EngineAssignedWorldManager {
private final ChronoLatch cln;
private final ChronoLatch chunkUpdater;
private final ChronoLatch chunkDiscovery;
private final KMap<Long, Future<?>> cleanup = new KMap<>();
private final ScheduledExecutorService cleanupService;
private double energy = 25;
private int entityCount = 0;
private long charge = 0;
@@ -98,6 +98,7 @@ public class IrisWorldManager extends EngineAssignedWorldManager {
looper = null;
chunkUpdater = null;
chunkDiscovery = null;
cleanupService = null;
id = -1;
}
@@ -109,6 +110,11 @@ public class IrisWorldManager extends EngineAssignedWorldManager {
cl = new ChronoLatch(3000);
ecl = new ChronoLatch(250);
clw = new ChronoLatch(1000, true);
cleanupService = Executors.newSingleThreadScheduledExecutor(runnable -> {
var thread = new Thread(runnable, "Iris Mantle Cleanup " + getTarget().getWorld().name());
thread.setPriority(Thread.MIN_PRIORITY);
return thread;
});
id = engine.getCacheID();
energy = 25;
looper = new Looper() {
@@ -122,10 +128,6 @@ public class IrisWorldManager extends EngineAssignedWorldManager {
getEngine().getWorld().tryGetRealWorld();
}
if (!IrisSettings.get().getWorld().isMarkerEntitySpawningSystem() && !IrisSettings.get().getWorld().isAnbientEntitySpawningSystem()) {
return 3000;
}
if (getEngine().getWorld().hasRealWorld()) {
if (getEngine().getWorld().getPlayers().isEmpty()) {
return 5000;
@@ -139,6 +141,13 @@ public class IrisWorldManager extends EngineAssignedWorldManager {
discoverChunks();
}
if (cln.flip()) {
engine.getEngineData().cleanup(getEngine());
}
if (!IrisSettings.get().getWorld().isMarkerEntitySpawningSystem() && !IrisSettings.get().getWorld().isAnbientEntitySpawningSystem()) {
return 3000;
}
if (getDimension().isInfiniteEnergy()) {
energy += 1000;
@@ -150,10 +159,6 @@ public class IrisWorldManager extends EngineAssignedWorldManager {
fixEnergy();
}
if (cln.flip()) {
engine.getEngineData().cleanup(getEngine());
}
if (precount != null) {
entityCount = 0;
for (Entity i : precount) {
@@ -181,7 +186,7 @@ public class IrisWorldManager extends EngineAssignedWorldManager {
}
};
looper.setPriority(Thread.MIN_PRIORITY);
looper.setName("Iris World Manager");
looper.setName("Iris World Manager " + getTarget().getWorld().name());
looper.start();
}
@@ -425,16 +430,14 @@ public class IrisWorldManager extends EngineAssignedWorldManager {
return;
}
var ref = new WeakReference<>(e.getWorld());
int cX = e.getX(), cZ = e.getZ();
J.s(() -> {
World world = ref.get();
if (world == null || !world.isChunkLoaded(cX, cZ))
return;
Long key = Cache.key(e);
cleanup.put(key, cleanupService.schedule(() -> {
cleanup.remove(key);
energy += 0.3;
fixEnergy();
getEngine().cleanupMantleChunk(cX, cZ);
}, IrisSettings.get().getPerformance().mantleCleanupDelay);
}, Math.max(IrisSettings.get().getPerformance().mantleCleanupDelay * 50L, 0), TimeUnit.MILLISECONDS));
if (generated) {
//INMS.get().injectBiomesFromMantle(e, getMantle());
@@ -458,6 +461,14 @@ public class IrisWorldManager extends EngineAssignedWorldManager {
}
}
@Override
public void onChunkUnload(Chunk e) {
final var future = cleanup.remove(Cache.key(e));
if (future != null) {
future.cancel(false);
}
}
private void spawn(IrisPosition block, IrisSpawner spawner, boolean initial) {
if (getEngine().isClosed()) {
return;

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

@@ -1000,7 +1000,7 @@ public interface Engine extends DataProvider, Fallible, LootProvider, BlockUpdat
default void cleanupMantleChunk(int x, int z) {
if (IrisSettings.get().getPerformance().isTrimMantleInStudio() || !isStudio()) {
J.a(() -> getMantle().cleanupChunk(x, z));
getMantle().cleanupChunk(x, z);
}
}
}

8
core/src/main/java/com/volmit/iris/engine/framework/EngineAssignedWorldManager.java
View File

@@ -34,6 +34,7 @@ import org.bukkit.event.block.BlockBreakEvent;
import org.bukkit.event.block.BlockPlaceEvent;
import org.bukkit.event.player.PlayerInteractEvent;
import org.bukkit.event.world.ChunkLoadEvent;
import org.bukkit.event.world.ChunkUnloadEvent;
import org.bukkit.event.world.WorldSaveEvent;
import org.bukkit.event.world.WorldUnloadEvent;
import org.bukkit.inventory.EquipmentSlot;
@@ -125,6 +126,13 @@ public abstract class EngineAssignedWorldManager extends EngineAssignedComponent
}
}
@EventHandler
public void on(ChunkUnloadEvent e) {
if (e.getChunk().getWorld().equals(getTarget().getWorld().realWorld())) {
onChunkUnload(e.getChunk());
}
}
@Override
public void close() {
super.close();

2
core/src/main/java/com/volmit/iris/engine/framework/EngineWorldManager.java
View File

@@ -45,6 +45,8 @@ public interface EngineWorldManager {
void onChunkLoad(Chunk e, boolean generated);
void onChunkUnload(Chunk e);
void chargeEnergy();
void teleportAsync(PlayerTeleportEvent e);

3
core/src/main/java/com/volmit/iris/engine/mantle/MantleWriter.java
View File

@@ -40,6 +40,7 @@ import com.volmit.iris.util.matter.Matter;
import com.volmit.iris.util.matter.MatterCavern;
import com.volmit.iris.util.matter.TileWrapper;
import com.volmit.iris.util.noise.CNG;
import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap;
import lombok.Data;
import org.bukkit.block.data.BlockData;
import org.bukkit.util.Vector;
@@ -62,7 +63,7 @@ public class MantleWriter implements IObjectPlacer, AutoCloseable {
this.mantle = mantle;
this.radius = radius * 2;
final int d = this.radius + 1;
this.cachedChunks = multicore ? new KMap<>(d * d, 0.75f, Math.max(32, Runtime.getRuntime().availableProcessors() * 4)) : new HashMap<>(d * d);
this.cachedChunks = multicore ? new KMap<>(d * d, 0.75f, Math.max(32, Runtime.getRuntime().availableProcessors() * 4)) : new Long2ObjectOpenHashMap<>(d * d);
this.x = x;
this.z = z;

20
core/src/main/java/com/volmit/iris/util/context/IrisContext.java
View File

@@ -63,14 +63,20 @@ public class IrisContext {
}
}
public static void dereference() {
for (Thread i : context.k()) {
if (!i.isAlive() || context.get(i).engine.isClosed()) {
if (context.get(i).engine.isClosed()) {
Iris.debug("Dereferenced Context<Engine> " + i.getName() + " " + i.threadId());
}
public static synchronized void dereference() {
var it = context.entrySet().iterator();
while (it.hasNext()) {
var entry = it.next();
var thread = entry.getKey();
var context = entry.getValue();
if (thread == null || context == null) {
it.remove();
continue;
}
context.remove(i);
if (!thread.isAlive() || context.engine.isClosed()) {
Iris.debug("Dereferenced Context<Engine> " + thread.getName() + " " + thread.threadId());
it.remove();
}
}
}

4
core/src/main/java/com/volmit/iris/util/parallel/AtomicBooleanArray.java
View File

@@ -24,6 +24,10 @@ public class AtomicBooleanArray implements Serializable {
AA.setVolatile(array, index, newValue);
}
public final boolean getAndSet(int index, boolean newValue) {
return (boolean) AA.getAndSet(array, index, newValue);
}
public final boolean compareAndSet(int index, boolean expectedValue, boolean newValue) {
return (boolean) AA.compareAndSet(array, index, expectedValue, newValue);
}

20
core/src/main/kotlin/com/volmit/iris/engine/mantle/MatterGenerator.kt
View File

@@ -27,13 +27,21 @@ interface MatterGenerator {
mantle.write(engine.mantle, x, z, radius, multicore).use { writer ->
for (pair in components) {
radius(x, z, pair.b) { x, z ->
for (c in pair.a) {
launch(multicore) {
writer.acquireChunk(x, z)
.raiseFlagSuspend(MantleFlag.PLANNED, c.flag) {
runBlocking {
radius(x, z, pair.b) { x, z ->
val mc = writer.acquireChunk(x, z)
if (mc.isFlagged(MantleFlag.PLANNED))
return@radius
for (c in pair.a) {
if (mc.isFlagged(c.flag))
continue
launch(multicore) {
mc.raiseFlagSuspend(c.flag) {
c.generateLayer(writer, x, z, context)
}
}
}
}
}
@@ -46,7 +54,7 @@ interface MatterGenerator {
}
}
private inline fun radius(x: Int, z: Int, radius: Int, crossinline task: suspend CoroutineScope.(Int, Int) -> Unit) = runBlocking {
private inline fun radius(x: Int, z: Int, radius: Int, crossinline task: (Int, Int) -> Unit) {
for (i in -radius..radius) {
for (j in -radius..radius) {
task(x + i, z + j)

16
core/src/main/kotlin/com/volmit/iris/util/mantle/FlaggedChunk.kt
View File

@@ -49,19 +49,15 @@ abstract class FlaggedChunk() {
flags.set(flag.ordinal(), value)
}
suspend fun raiseFlagSuspend(guard: MantleFlag?, flag: MantleFlag, task: suspend () -> Unit) {
suspend fun raiseFlagSuspend(flag: MantleFlag, task: suspend () -> Unit) {
if (isClosed()) throw IllegalStateException("Chunk is closed!")
if (guard != null && isFlagged(guard)) return
if (isFlagged(flag)) return
locks[flag.ordinal()].withLock {
if (flags.compareAndSet(flag.ordinal(), false, true)) {
try {
task()
} catch (e: Throwable) {
flags.set(flag.ordinal(), false)
throw e
}
}
if (isFlagged(flag)) return
task()
if (flags.getAndSet(flag.ordinal(), true))
throw IllegalStateException("Flag ${flag.name()} was already set after task ran!")
}
}