diff --git a/coreSubProjects b/coreSubProjects index 56c09f5f5..7e222b755 160000 --- a/coreSubProjects +++ b/coreSubProjects @@ -1 +1 @@ -Subproject commit 56c09f5f5cf8e05b1731d7a75a6ea885131563f8 +Subproject commit 7e222b7555688a368a031649d070a51461a3e26d diff --git a/fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricClientProxy.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricClientProxy.java index 601d8c838..8ece08603 100644 --- a/fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricClientProxy.java +++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricClientProxy.java @@ -59,6 +59,7 @@ import com.seibel.distanthorizons.core.network.messages.AbstractNetworkMessage; import java.nio.FloatBuffer; #endif import java.util.HashSet; +import java.util.concurrent.AbstractExecutorService; import java.util.concurrent.ThreadPoolExecutor; 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 // if the getChunk() takes longer than expected // (which can be caused by certain mods) - ThreadPoolExecutor executor = ThreadPoolUtil.getFileHandlerExecutor(); + AbstractExecutorService executor = ThreadPoolUtil.getFileHandlerExecutor(); if (executor != null) { executor.execute(() -> @@ -182,7 +183,7 @@ public class FabricClientProxy implements AbstractModInitializer.IEventProxy // executor to prevent locking up the render/event thread // if the getChunk() takes longer than expected // (which can be caused by certain mods) - ThreadPoolExecutor executor = ThreadPoolUtil.getFileHandlerExecutor(); + AbstractExecutorService executor = ThreadPoolUtil.getFileHandlerExecutor(); if (executor != null) { executor.execute(() -> diff --git a/forge/src/main/java/com/seibel/distanthorizons/forge/ForgeClientProxy.java b/forge/src/main/java/com/seibel/distanthorizons/forge/ForgeClientProxy.java index a51ca7551..9ca5c1c9e 100644 --- a/forge/src/main/java/com/seibel/distanthorizons/forge/ForgeClientProxy.java +++ b/forge/src/main/java/com/seibel/distanthorizons/forge/ForgeClientProxy.java @@ -62,6 +62,7 @@ import net.minecraftforge.event.TickEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import org.lwjgl.opengl.GL32; +import java.util.concurrent.AbstractExecutorService; import java.util.concurrent.ThreadPoolExecutor; /** @@ -185,7 +186,7 @@ public class ForgeClientProxy implements AbstractModInitializer.IEventProxy LevelAccessor level = event.getLevel(); #endif - ThreadPoolExecutor executor = ThreadPoolUtil.getFileHandlerExecutor(); + AbstractExecutorService executor = ThreadPoolUtil.getFileHandlerExecutor(); if (executor != null) { executor.execute(() -> @@ -214,7 +215,7 @@ public class ForgeClientProxy implements AbstractModInitializer.IEventProxy LevelAccessor level = event.getLevel(); #endif - ThreadPoolExecutor executor = ThreadPoolUtil.getFileHandlerExecutor(); + AbstractExecutorService executor = ThreadPoolUtil.getFileHandlerExecutor(); if (executor != null) { executor.execute(() -> diff --git a/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/NeoforgeClientProxy.java b/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/NeoforgeClientProxy.java index 3f4c867bc..559791600 100644 --- a/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/NeoforgeClientProxy.java +++ b/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/NeoforgeClientProxy.java @@ -61,6 +61,7 @@ import net.neoforged.neoforge.event.TickEvent; #else import net.neoforged.neoforge.client.event.ClientTickEvent; +import java.util.concurrent.AbstractExecutorService; import java.util.concurrent.ThreadPoolExecutor; #endif @@ -169,7 +170,7 @@ public class NeoforgeClientProxy implements AbstractModInitializer.IEventProxy // executor to prevent locking up the render/event thread // if the getChunk() takes longer than expected // (which can be caused by certain mods) - ThreadPoolExecutor executor = ThreadPoolUtil.getFileHandlerExecutor(); + AbstractExecutorService executor = ThreadPoolUtil.getFileHandlerExecutor(); if (executor != null) { executor.execute(() -> @@ -196,7 +197,7 @@ public class NeoforgeClientProxy implements AbstractModInitializer.IEventProxy // executor to prevent locking up the render/event thread // if the getChunk() takes longer than expected // (which can be caused by certain mods) - ThreadPoolExecutor executor = ThreadPoolUtil.getFileHandlerExecutor(); + AbstractExecutorService executor = ThreadPoolUtil.getFileHandlerExecutor(); if (executor != null) { executor.execute(() ->