Repo-Mirror/craft-engine
9
0
Fork 0
mirror of https://github.com/Xiao-MoMi/craft-engine.git synced 2025-12-29 03:49:15 +00:00
Code Issues Releases Activity

Remove World Thread

Browse Source
This commit is contained in:
XiaoMoMi
2025-02-15 04:43:45 +08:00
parent d657a481f5
commit e67aecbe77
4 changed files with 12 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
core/src/main/java/net/momirealms/craftengine/core/world/CEWorld.java
View File

@@ -11,7 +11,6 @@ import java.util.Collections;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.locks.ReentrantReadWriteLock;
public abstract class CEWorld {
@@ -20,7 +19,6 @@ public abstract class CEWorld {
protected final Map<Long, CEChunk> loadedChunkMap;
protected final WorldDataStorage worldDataStorage;
protected final ReentrantReadWriteLock loadedChunkMapLock = new ReentrantReadWriteLock();
protected final WorldExecutor executor;
protected final WorldHeight worldHeightAccessor;
protected final Set<SectionPos> updatedSectionPositions = Collections.synchronizedSet(new HashSet<>());
@@ -31,7 +29,6 @@ public abstract class CEWorld {
this.world = world;
this.loadedChunkMap = new Long2ObjectOpenHashMap<>(1024, 0.5f);
this.worldDataStorage = new DefaultRegionFileStorage(world.directory().resolve(REGION_DIRECTORY));
this.executor = new WorldExecutor(this);
this.worldHeightAccessor = world.worldHeight();
this.lastChunkPos = ChunkPos.INVALID_CHUNK_POS;
}
@@ -73,9 +70,6 @@ public abstract class CEWorld {
@Nullable
public CEChunk getLoadedChunkImmediately(int x, int z) {
if (WorldThread.isWorldThreadFor(this)) {
return this.getChunkAtIfLoadedWorldThread(x, z);
}
long longKey = ChunkPos.asLong(x, z);
this.loadedChunkMapLock.readLock().lock();
try {
@@ -86,7 +80,7 @@ public abstract class CEWorld {
}
@Nullable
public CEChunk getChunkAtIfLoadedWorldThread(long chunkPos) {
public CEChunk getChunkAtIfLoadedMainThread(long chunkPos) {
if (chunkPos == this.lastChunkPos) {
return this.lastChunk;
}
@@ -99,17 +93,14 @@ public abstract class CEWorld {
}
@Nullable
public CEChunk getChunkAtIfLoadedWorldThread(int x, int z) {
return getChunkAtIfLoadedWorldThread(ChunkPos.asLong(x, z));
public CEChunk getChunkAtIfLoadedMainThread(int x, int z) {
return getChunkAtIfLoadedMainThread(ChunkPos.asLong(x, z));
}
@Nullable
public CEChunk getChunkAtIfLoaded(int x, int z) {
if (!WorldThread.isWorldThreadFor(this)) {
return CompletableFuture.supplyAsync(() -> this.getChunkAtIfLoaded(x, z), this.executor).join();
}
long chunkPos = ChunkPos.asLong(x, z);
return this.getChunkAtIfLoadedWorldThread(chunkPos);
return this.getChunkAtIfLoadedMainThread(chunkPos);
}
public WorldHeight worldHeight() {

21
core/src/main/java/net/momirealms/craftengine/core/world/WorldExecutor.java
View File

@@ -1,21 +0,0 @@
package net.momirealms.craftengine.core.world;
import org.jetbrains.annotations.NotNull;
import java.util.concurrent.Executor;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
public class WorldExecutor implements Executor {
private final ExecutorService threadPool;
public WorldExecutor(CEWorld world) {
this.threadPool = Executors.newSingleThreadExecutor(r -> new WorldThread(r, "CEWorld-Thread-" + world.world().name(), world));
}
@Override
public void execute(@NotNull Runnable command) {
this.threadPool.execute(command);
}
}

18
core/src/main/java/net/momirealms/craftengine/core/world/WorldThread.java
View File

@@ -1,18 +0,0 @@
package net.momirealms.craftengine.core.world;
public class WorldThread extends Thread {
private final CEWorld world;
public WorldThread(Runnable target, String name, CEWorld world) {
super(target, name);
this.world = world;
}
public static boolean isWorldThreadFor(CEWorld world) {
if (Thread.currentThread() instanceof WorldThread worldThread) {
return worldThread.world == world;
}
return false;
}
}