From a44a5d7465603b4e3d560922c73785d7b4beeb16 Mon Sep 17 00:00:00 2001 From: James Seibel Date: Sat, 13 Dec 2025 11:19:39 -0600 Subject: [PATCH] replace client ticks with a timer Prevents DH loading issues when MC ticks are paused --- coreSubProjects | 2 +- .../fabric/FabricClientProxy.java | 8 ------- .../forge/ForgeClientProxy.java | 15 ------------ .../neoforge/NeoforgeClientProxy.java | 23 ------------------- 4 files changed, 1 insertion(+), 47 deletions(-) diff --git a/coreSubProjects b/coreSubProjects index 7f0ddadf2..5be5c5a5b 160000 --- a/coreSubProjects +++ b/coreSubProjects @@ -1 +1 @@ -Subproject commit 7f0ddadf26f0cd26ce5945fafe622292f7f86dae +Subproject commit 5be5c5a5bcca411fa16140f0da9b3343ebd9c5f9 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 fee42ffd6..4cdbd4dde 100644 --- a/fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricClientProxy.java +++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricClientProxy.java @@ -113,14 +113,6 @@ public class FabricClientProxy implements AbstractModInitializer.IEventProxy - //=============// - // tick events // - //=============// - - ClientTickEvents.START_CLIENT_TICK.register((client) -> { ClientApi.INSTANCE.clientTickEvent(); }); - - - //==============// // chunk events // //==============// 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 f96b416fe..4ae119cb1 100644 --- a/forge/src/main/java/com/seibel/distanthorizons/forge/ForgeClientProxy.java +++ b/forge/src/main/java/com/seibel/distanthorizons/forge/ForgeClientProxy.java @@ -107,21 +107,6 @@ public class ForgeClientProxy implements AbstractModInitializer.IEventProxy - //=============// - // tick events // - //=============// - - @SubscribeEvent - public void clientTickEvent(TickEvent.ClientTickEvent event) - { - if (event.phase == TickEvent.Phase.START) - { - ClientApi.INSTANCE.clientTickEvent(); - } - } - - - //==============// // world events // //==============// 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 690f0aec4..e00d25c0a 100644 --- a/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/NeoforgeClientProxy.java +++ b/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/NeoforgeClientProxy.java @@ -73,29 +73,6 @@ public class NeoforgeClientProxy implements AbstractModInitializer.IEventProxy - //=============// - // tick events // - //=============// - - #if MC_VER < MC_1_20_6 - @SubscribeEvent - public void clientTickEvent(TickEvent.ClientTickEvent event) - { - if (event.phase == TickEvent.Phase.START) - { - ClientApi.INSTANCE.clientTickEvent(); - } - } - #else - @SubscribeEvent - public void clientTickEvent(ClientTickEvent.Pre event) - { - ClientApi.INSTANCE.clientTickEvent(); - } - #endif - - - //==============// // world events // //==============//