From 8003a8624292fea5f06f030678c6126afb04066d Mon Sep 17 00:00:00 2001 From: Username404-59 Date: Sun, 2 Feb 2025 22:02:24 +0100 Subject: [PATCH] Use the right bus for miscellaneous handlers too Signed-off-by: Username404-59 --- .../main/kotlin/fr/username404/snowygui/forge/ForgeInit.kt | 6 ++++-- .../forge/{MiscHandlers.kt => MiscModBusHandlers.kt} | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) rename neoforge/src/main/kotlin/fr/username404/snowygui/forge/{MiscHandlers.kt => MiscModBusHandlers.kt} (95%) diff --git a/neoforge/src/main/kotlin/fr/username404/snowygui/forge/ForgeInit.kt b/neoforge/src/main/kotlin/fr/username404/snowygui/forge/ForgeInit.kt index 5db8073..065d1b7 100644 --- a/neoforge/src/main/kotlin/fr/username404/snowygui/forge/ForgeInit.kt +++ b/neoforge/src/main/kotlin/fr/username404/snowygui/forge/ForgeInit.kt @@ -28,10 +28,12 @@ class ForgeInit(container: ModContainer): Snowy() { .map { Class.forName((it!!.javaClass.getDeclaredField("clazz").apply { isAccessible = true }.get(it) as Type).className).asSubclass(ButtonImpl::class.java)} .toSet() init { - container.eventBus!!.addListener(this@ForgeInit::initSetup) + container.eventBus!!.run { + addListener(this@ForgeInit::initSetup) + register(MiscModBusHandlers) + } NeoForge.EVENT_BUS.run { register(EndTickHandler) - register(MiscHandlers) register(HudHandler) register(ZoomHandler) } diff --git a/neoforge/src/main/kotlin/fr/username404/snowygui/forge/MiscHandlers.kt b/neoforge/src/main/kotlin/fr/username404/snowygui/forge/MiscModBusHandlers.kt similarity index 95% rename from neoforge/src/main/kotlin/fr/username404/snowygui/forge/MiscHandlers.kt rename to neoforge/src/main/kotlin/fr/username404/snowygui/forge/MiscModBusHandlers.kt index 5858a6f..4370271 100644 --- a/neoforge/src/main/kotlin/fr/username404/snowygui/forge/MiscHandlers.kt +++ b/neoforge/src/main/kotlin/fr/username404/snowygui/forge/MiscModBusHandlers.kt @@ -7,7 +7,7 @@ import net.neoforged.bus.api.SubscribeEvent import net.neoforged.neoforge.client.event.RegisterKeyMappingsEvent import net.neoforged.neoforge.client.event.RegisterMenuScreensEvent -object MiscHandlers { +object MiscModBusHandlers { @SubscribeEvent fun handleClickGuiInit(event: RegisterMenuScreensEvent) { ClickGui.tick()