From febeddb0930bc2be79de59fd642ffc200b75ea20 Mon Sep 17 00:00:00 2001 From: Username404-59 Date: Sun, 2 Feb 2025 19:36:04 +0100 Subject: [PATCH] Move EndTickMixin to fabric, to replace it using a ClientTickEvent in neoforge Signed-off-by: Username404-59 --- common/src/main/resources/snowygui-common.mixins.json | 1 - .../fr/username404/snowygui/mixins/EndTickMixin.java | 0 fabric/src/main/resources/snowygui-fabric.mixins.json | 1 + .../fr/username404/snowygui/forge/EndTickHandler.kt | 11 +++++++++++ .../kotlin/fr/username404/snowygui/forge/ForgeInit.kt | 1 + 5 files changed, 13 insertions(+), 1 deletion(-) rename {common => fabric}/src/main/java/fr/username404/snowygui/mixins/EndTickMixin.java (100%) create mode 100644 neoforge/src/main/kotlin/fr/username404/snowygui/forge/EndTickHandler.kt diff --git a/common/src/main/resources/snowygui-common.mixins.json b/common/src/main/resources/snowygui-common.mixins.json index 8370bc4..88f6387 100644 --- a/common/src/main/resources/snowygui-common.mixins.json +++ b/common/src/main/resources/snowygui-common.mixins.json @@ -5,7 +5,6 @@ "client": [ "KeysAccessor", "KeyMappings", - "EndTickMixin", "TitleScreenMixin", "OptionValueAccessor" ], diff --git a/common/src/main/java/fr/username404/snowygui/mixins/EndTickMixin.java b/fabric/src/main/java/fr/username404/snowygui/mixins/EndTickMixin.java similarity index 100% rename from common/src/main/java/fr/username404/snowygui/mixins/EndTickMixin.java rename to fabric/src/main/java/fr/username404/snowygui/mixins/EndTickMixin.java diff --git a/fabric/src/main/resources/snowygui-fabric.mixins.json b/fabric/src/main/resources/snowygui-fabric.mixins.json index 41a252c..dc74ea0 100644 --- a/fabric/src/main/resources/snowygui-fabric.mixins.json +++ b/fabric/src/main/resources/snowygui-fabric.mixins.json @@ -3,6 +3,7 @@ "package": "fr.username404.snowygui.mixins", "compatibilityLevel": "JAVA_18", "client": [ + "EndTickMixin", "ZoomMixin", "OkZoomerAlternativeMixin" ], diff --git a/neoforge/src/main/kotlin/fr/username404/snowygui/forge/EndTickHandler.kt b/neoforge/src/main/kotlin/fr/username404/snowygui/forge/EndTickHandler.kt new file mode 100644 index 0000000..529c3b3 --- /dev/null +++ b/neoforge/src/main/kotlin/fr/username404/snowygui/forge/EndTickHandler.kt @@ -0,0 +1,11 @@ +package fr.username404.snowygui.forge + +import fr.username404.snowygui.EventSnowy +import net.neoforged.bus.api.SubscribeEvent +import net.neoforged.neoforge.client.event.ClientTickEvent + +object EndTickHandler: EventSnowy { + override val type: String = "EndTick" + @SubscribeEvent + fun handleEndTick(event: ClientTickEvent.Post) = fire() +} \ No newline at end of file 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 98b2491..c7f8cb1 100644 --- a/neoforge/src/main/kotlin/fr/username404/snowygui/forge/ForgeInit.kt +++ b/neoforge/src/main/kotlin/fr/username404/snowygui/forge/ForgeInit.kt @@ -29,6 +29,7 @@ class ForgeInit(container: ModContainer): Snowy() { init { container.eventBus!!.run { addListener(this@ForgeInit::initSetup) + register(EndTickHandler) register(HudHandler) register(ZoomHandler) }