Repo-Mirror/AkarinMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

Correct async lighting

Browse Source
This commit is contained in:
Sotr
2018-06-12 01:46:43 +08:00
parent 095a6e4d0b
commit 55248e4deb
3 changed files with 28 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
sources/src/main/java/io/akarin/server/mixin/lighting/MixinChunk.java
View File

@@ -124,14 +124,18 @@ public abstract class MixinChunk implements IMixinChunk {
private void onTickHead(boolean skipRecheckGaps, CallbackInfo ci) { private void onTickHead(boolean skipRecheckGaps, CallbackInfo ci) {
final List<Chunk> neighbors = this.getSurroundingChunks(); final List<Chunk> neighbors = this.getSurroundingChunks();
if (this.isGapLightingUpdated && this.world.worldProvider.m() && !skipRecheckGaps && !neighbors.isEmpty()) { // PAIL: isGapLightingUpdated - hasSkyLight if (this.isGapLightingUpdated && this.world.worldProvider.m() && !skipRecheckGaps && !neighbors.isEmpty()) { // PAIL: isGapLightingUpdated - hasSkyLight
this.recheckGapsAsync(neighbors); this.lightExecutorService.execute(() -> {
this.recheckGapsAsync(neighbors);
});
this.isGapLightingUpdated = false; this.isGapLightingUpdated = false;
} }
this.ticked = true; this.ticked = true;
if (!this.isLightPopulated && this.isTerrainPopulated && !neighbors.isEmpty()) { if (!this.isLightPopulated && this.isTerrainPopulated && !neighbors.isEmpty()) {
this.checkLightAsync(neighbors); this.lightExecutorService.execute(() -> {
this.checkLightAsync(neighbors);
});
// set to true to avoid requeuing the same task when not finished // set to true to avoid requeuing the same task when not finished
this.isLightPopulated = true; this.isLightPopulated = true;
} }
@@ -228,7 +232,7 @@ public abstract class MixinChunk implements IMixinChunk {
@Inject(method = "o()V", at = @At("HEAD"), cancellable = true) @Inject(method = "o()V", at = @At("HEAD"), cancellable = true)
private void checkLightHead(CallbackInfo ci) { private void checkLightHead(CallbackInfo ci) {
if (this.world.getMinecraftServer().isStopped()) { if (this.world.getMinecraftServer().isStopped() || this.lightExecutorService.isShutdown()) {
return; return;
} }
@@ -243,11 +247,13 @@ public abstract class MixinChunk implements IMixinChunk {
if (Akari.isPrimaryThread()) { // Akarin if (Akari.isPrimaryThread()) { // Akarin
try { try {
this.checkLightAsync(neighborChunks); this.lightExecutorService.execute(() -> {
this.checkLightAsync(neighborChunks);
});
} catch (RejectedExecutionException ex) { } catch (RejectedExecutionException ex) {
// This could happen if ServerHangWatchdog kills the server // This could happen if ServerHangWatchdog kills the server
// between the start of the method and the execute() call. // between the start of the method and the execute() call.
if (!this.world.getMinecraftServer().isStopped()) { if (!this.world.getMinecraftServer().isStopped() && !this.lightExecutorService.isShutdown()) {
throw ex; throw ex;
} }
} }
@@ -445,7 +451,9 @@ public abstract class MixinChunk implements IMixinChunk {
@Inject(method = "c(III)V", at = @At("HEAD"), cancellable = true) @Inject(method = "c(III)V", at = @At("HEAD"), cancellable = true)
private void onRelightBlock(int x, int y, int z, CallbackInfo ci) { private void onRelightBlock(int x, int y, int z, CallbackInfo ci) {
this.relightBlockAsync(x, y, z); this.lightExecutorService.execute(() -> {
this.relightBlockAsync(x, y, z);
});
ci.cancel(); ci.cancel();
} }
@@ -464,7 +472,7 @@ public abstract class MixinChunk implements IMixinChunk {
j = y; j = y;
} }
while (j > 0 && this.getBlockData(x, j - 1, z).c() == 0) { while (j > 0 && this.getBlockData(x, j - 1, z).c() == 0) { // PAIL: getLightOpacity
--j; --j;
} }
@@ -481,7 +489,7 @@ public abstract class MixinChunk implements IMixinChunk {
if (extendedblockstorage2 != Chunk.EMPTY_CHUNK_SECTION) { if (extendedblockstorage2 != Chunk.EMPTY_CHUNK_SECTION) {
extendedblockstorage2.a(x, j1 & 15, z, 15); // PAIL: setSkyLight extendedblockstorage2.a(x, j1 & 15, z, 15); // PAIL: setSkyLight
this.world.m(new BlockPosition((this.locX << 4) + x, j1, (this.locZ << 4) + z)); // PAIL: notifyLightSet // this.world.m(new BlockPosition((this.locX << 4) + x, j1, (this.locZ << 4) + z)); // PAIL: notifyLightSet - client side
} }
} }
} else { } else {
@@ -490,7 +498,7 @@ public abstract class MixinChunk implements IMixinChunk {
if (extendedblockstorage != Chunk.EMPTY_CHUNK_SECTION) { if (extendedblockstorage != Chunk.EMPTY_CHUNK_SECTION) {
extendedblockstorage.a(x, i1 & 15, z, 0); // PAIL: setSkyLight extendedblockstorage.a(x, i1 & 15, z, 0); // PAIL: setSkyLight
this.world.m(new BlockPosition((this.locX << 4) + x, i1, (this.locZ << 4) + z)); // PAIL: notifyLightSet // this.world.m(new BlockPosition((this.locX << 4) + x, i1, (this.locZ << 4) + z)); // PAIL: notifyLightSet - client side
} }
} }
} }

1
sources/src/main/java/io/akarin/server/mixin/lighting/MixinWorld.java
View File

@@ -42,6 +42,5 @@ public abstract class MixinWorld {
@Shadow(aliases = "c") public abstract boolean checkLightFor(EnumSkyBlock lightType, BlockPosition pos); @Shadow(aliases = "c") public abstract boolean checkLightFor(EnumSkyBlock lightType, BlockPosition pos);
@Shadow public abstract MinecraftServer getMinecraftServer(); @Shadow public abstract MinecraftServer getMinecraftServer();
@Shadow public abstract boolean areChunksLoaded(BlockPosition center, int radius, boolean allowEmpty); @Shadow public abstract boolean areChunksLoaded(BlockPosition center, int radius, boolean allowEmpty);
@Shadow(aliases = "m") public abstract void notifyLightSet(BlockPosition pos);
@Shadow public abstract Chunk getChunkIfLoaded(int x, int z); @Shadow public abstract Chunk getChunkIfLoaded(int x, int z);
} }

14
sources/src/main/java/io/akarin/server/mixin/lighting/MixinWorldServer.java
View File

@@ -54,9 +54,9 @@ public abstract class MixinWorldServer extends MixinWorld implements IMixinWorld
private static final short XZ_MASK = 0xF; private static final short XZ_MASK = 0xF;
private static final short Y_SHORT_MASK = 0xFF; private static final short Y_SHORT_MASK = 0xFF;
private final ExecutorService lightExecutorService = preparExecutorService();; private final ExecutorService lightExecutorService = getExecutorService();;
private ExecutorService preparExecutorService() { private ExecutorService getExecutorService() {
return AkarinGlobalConfig.asyncLightingWorkStealing ? return AkarinGlobalConfig.asyncLightingWorkStealing ?
Executors.newFixedThreadPool(AkarinGlobalConfig.asyncLightingThreads, new ThreadFactoryBuilder().setNameFormat("Akarin Async Light Thread").build()) : Executors.newWorkStealingPool(AkarinGlobalConfig.asyncLightingThreads); Executors.newFixedThreadPool(AkarinGlobalConfig.asyncLightingThreads, new ThreadFactoryBuilder().setNameFormat("Akarin Async Light Thread").build()) : Executors.newWorkStealingPool(AkarinGlobalConfig.asyncLightingThreads);
} }
@@ -98,7 +98,7 @@ public abstract class MixinWorldServer extends MixinWorld implements IMixinWorld
this.setLightForAsync(lightType, blockpos, 0, currentChunk, neighbors); // Sponge - use thread safe method this.setLightForAsync(lightType, blockpos, 0, currentChunk, neighbors); // Sponge - use thread safe method
if (l2 > 0) { if (l2 > 0) {
int j3 = MathHelper.a(i2 - i1); // TODO MathHelper int j3 = MathHelper.a(i2 - i1); // abs
int k3 = MathHelper.a(j2 - j1); int k3 = MathHelper.a(j2 - j1);
int l3 = MathHelper.a(k2 - k1); int l3 = MathHelper.a(k2 - k1);
@@ -285,13 +285,13 @@ public abstract class MixinWorldServer extends MixinWorld implements IMixinWorld
if (pos.getY() < 0) { if (pos.getY() < 0) {
pos = new BlockPosition(pos.getX(), 0, pos.getZ()); pos = new BlockPosition(pos.getX(), 0, pos.getZ());
} }
if (!(pos.isValidLocation())) { if (!pos.isValidLocation()) {
return lightType.c; // PAIL: defaultLightValue return lightType.c; // PAIL: defaultLightValue
} }
final Chunk chunk = this.getLightChunk(pos, currentChunk, neighbors); final Chunk chunk = this.getLightChunk(pos, currentChunk, neighbors);
if (chunk == null || chunk.isUnloading()) { if (chunk == null || chunk.isUnloading()) {
return lightType.c; // PAIL: defaultLightValue return 0; // Akarin - fixes cave light - defaultLightValue -> 0
} }
return chunk.getBrightness(lightType, pos); return chunk.getBrightness(lightType, pos);
@@ -345,8 +345,8 @@ public abstract class MixinWorldServer extends MixinWorld implements IMixinWorld
if (pos.isValidLocation()) { if (pos.isValidLocation()) {
final Chunk chunk = this.getLightChunk(pos, currentChunk, neighbors); final Chunk chunk = this.getLightChunk(pos, currentChunk, neighbors);
if (chunk != null && !chunk.isUnloading()) { if (chunk != null && !chunk.isUnloading()) {
chunk.a(type, pos, lightValue); // PAIL: setBrightness chunk.a(type, pos, lightValue); // PAIL: setLightFor
this.notifyLightSet(pos); // this.notifyLightSet(pos); - client side
} }
} }
} }