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

Refactor thread pool handling

Browse Source
This commit is contained in:
s809
2025-01-06 23:32:29 +05:00
parent fda44c41a8
commit f12f119ce2
4 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
coreSubProjects
+1 -1
Submodule coreSubProjects updated: a444e3b974...14cd0c4b09
fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricClientProxy.java
+3 -2
View File
@@ -59,6 +59,7 @@ import com.seibel.distanthorizons.core.network.messages.AbstractNetworkMessage;
import java.nio.FloatBuffer; import java.nio.FloatBuffer;
#endif #endif
import java.util.HashSet; import java.util.HashSet;
import java.util.concurrent.AbstractExecutorService;
import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.ThreadPoolExecutor;
import net.minecraft.client.multiplayer.ClientLevel; import net.minecraft.client.multiplayer.ClientLevel;
@@ -142,7 +143,7 @@ public class FabricClientProxy implements AbstractModInitializer.IEventProxy
// executor to prevent locking up the render/event thread // executor to prevent locking up the render/event thread
// if the getChunk() takes longer than expected // if the getChunk() takes longer than expected
// (which can be caused by certain mods) // (which can be caused by certain mods)
ThreadPoolExecutor executor = ThreadPoolUtil.getFileHandlerExecutor(); AbstractExecutorService executor = ThreadPoolUtil.getFileHandlerExecutor();
if (executor != null) if (executor != null)
{ {
executor.execute(() -> executor.execute(() ->
@@ -182,7 +183,7 @@ public class FabricClientProxy implements AbstractModInitializer.IEventProxy
// executor to prevent locking up the render/event thread // executor to prevent locking up the render/event thread
// if the getChunk() takes longer than expected // if the getChunk() takes longer than expected
// (which can be caused by certain mods) // (which can be caused by certain mods)
ThreadPoolExecutor executor = ThreadPoolUtil.getFileHandlerExecutor(); AbstractExecutorService executor = ThreadPoolUtil.getFileHandlerExecutor();
if (executor != null) if (executor != null)
{ {
executor.execute(() -> executor.execute(() ->
forge/src/main/java/com/seibel/distanthorizons/forge/ForgeClientProxy.java
+3 -2
View File
@@ -62,6 +62,7 @@ import net.minecraftforge.event.TickEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.eventbus.api.SubscribeEvent;
import org.lwjgl.opengl.GL32; import org.lwjgl.opengl.GL32;
import java.util.concurrent.AbstractExecutorService;
import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.ThreadPoolExecutor;
/** /**
@@ -185,7 +186,7 @@ public class ForgeClientProxy implements AbstractModInitializer.IEventProxy
LevelAccessor level = event.getLevel(); LevelAccessor level = event.getLevel();
#endif #endif
ThreadPoolExecutor executor = ThreadPoolUtil.getFileHandlerExecutor(); AbstractExecutorService executor = ThreadPoolUtil.getFileHandlerExecutor();
if (executor != null) if (executor != null)
{ {
executor.execute(() -> executor.execute(() ->
@@ -214,7 +215,7 @@ public class ForgeClientProxy implements AbstractModInitializer.IEventProxy
LevelAccessor level = event.getLevel(); LevelAccessor level = event.getLevel();
#endif #endif
ThreadPoolExecutor executor = ThreadPoolUtil.getFileHandlerExecutor(); AbstractExecutorService executor = ThreadPoolUtil.getFileHandlerExecutor();
if (executor != null) if (executor != null)
{ {
executor.execute(() -> executor.execute(() ->
neoforge/src/main/java/com/seibel/distanthorizons/neoforge/NeoforgeClientProxy.java
+3 -2
View File
@@ -61,6 +61,7 @@ import net.neoforged.neoforge.event.TickEvent;
#else #else
import net.neoforged.neoforge.client.event.ClientTickEvent; import net.neoforged.neoforge.client.event.ClientTickEvent;
import java.util.concurrent.AbstractExecutorService;
import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.ThreadPoolExecutor;
#endif #endif
@@ -169,7 +170,7 @@ public class NeoforgeClientProxy implements AbstractModInitializer.IEventProxy
// executor to prevent locking up the render/event thread // executor to prevent locking up the render/event thread
// if the getChunk() takes longer than expected // if the getChunk() takes longer than expected
// (which can be caused by certain mods) // (which can be caused by certain mods)
ThreadPoolExecutor executor = ThreadPoolUtil.getFileHandlerExecutor(); AbstractExecutorService executor = ThreadPoolUtil.getFileHandlerExecutor();
if (executor != null) if (executor != null)
{ {
executor.execute(() -> executor.execute(() ->
@@ -196,7 +197,7 @@ public class NeoforgeClientProxy implements AbstractModInitializer.IEventProxy
// executor to prevent locking up the render/event thread // executor to prevent locking up the render/event thread
// if the getChunk() takes longer than expected // if the getChunk() takes longer than expected
// (which can be caused by certain mods) // (which can be caused by certain mods)
ThreadPoolExecutor executor = ThreadPoolUtil.getFileHandlerExecutor(); AbstractExecutorService executor = ThreadPoolUtil.getFileHandlerExecutor();
if (executor != null) if (executor != null)
{ {
executor.execute(() -> executor.execute(() ->