wisplite/distant-horizons-sharded
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Attempt to fix stuttering in MC 1.21.4 for pre-existing chunk pulling

Browse Source
This commit is contained in:
James Seibel
2024-12-20 15:36:36 -06:00
parent 70d897f09c
commit 0d556b5d95
1 changed files with 26 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/BatchGenerationEnvironment.java
+26 -15
View File
@@ -629,22 +629,33 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
return CompletableFuture.completedFuture(ioWorker.load(chunkPos));
#else
// when running in vanilla MC, loadAsync will run on this same thread due to a vanilla threading mixin,
// however if a mod like C2ME is installed this will run on a C2ME thread instead
return ioWorker.loadAsync(chunkPos)
.thenApply(optional -> optional.orElse(null))
.exceptionally((throwable) ->
{
// unwrap the CompletionException if necessary
Throwable actualThrowable = throwable;
while (actualThrowable instanceof CompletionException completionException)
// storage will be null if C2ME is installed
if (ioWorker.storage != null)
{
// run synchronously if possible to prevent lagging the server thread
return CompletableFuture.completedFuture(ioWorker.storage.read(chunkPos));
}
else
{
// When running in vanilla MC on versions before 1.21.4,
// DH would run loadAsync on this same thread via a threading mixin,
// to prevent causing lag on any MC threads.
// However, if a mod like C2ME is installed this will run on a C2ME thread instead.
return ioWorker.loadAsync(chunkPos)
.thenApply(optional -> optional.orElse(null))
.exceptionally((throwable) ->
{
actualThrowable = completionException.getCause();
}
LOAD_LOGGER.warn("DistantHorizons: Couldn't load or make chunk ["+chunkPos+"], error: ["+actualThrowable.getMessage()+"].", actualThrowable);
return null;
});
// unwrap the CompletionException if necessary
Throwable actualThrowable = throwable;
while (actualThrowable instanceof CompletionException completionException)
{
actualThrowable = completionException.getCause();
}
LOAD_LOGGER.warn("DistantHorizons: Couldn't load or make chunk ["+chunkPos+"], error: ["+actualThrowable.getMessage()+"].", actualThrowable);
return null;
});
}
#endif
}
catch (Exception e)