R3944Realms/ModernFix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix main thread not actually blocking until JEI thread finishes

Browse Source
This commit is contained in:
embeddedt 2023-02-21 22:35:29 -05:00
parent bc5b85efcc
commit a4ce490963
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/org/embeddedt/modernfix/mixin/perf/async_jei/ClientLifecycleHandlerMixin.java
View File

@ -66,7 +66,10 @@ public class ClientLifecycleHandlerMixin {
JEIReloadThread currentReloadThread = reloadThread;
if(currentReloadThread != null) {
currentReloadThread.requestStop();
Minecraft.getInstance().managedBlock(currentReloadThread::isAlive);
if(currentReloadThread.isAlive()) {
ModernFix.LOGGER.warn("Blocking until JEI thread terminates");
Minecraft.getInstance().managedBlock(() -> !currentReloadThread.isAlive());
}
reloadThread = null;
}
}
@ -74,7 +77,6 @@ public class ClientLifecycleHandlerMixin {
private static int numReloads = 1;
private void startJEIAsync(Runnable whenFinishedCb) {
ModernFix.LOGGER.info("JEI restart triggered. Waiting for previous thread to die.");
cancelPreviousStart();
ModernFix.LOGGER.info("Starting new JEI thread.");
JEIReloadThread newThread = new JEIReloadThread(() -> {