From 701a2aedc6837cfc505df0b12bfae24b8ac3d0c6 Mon Sep 17 00:00:00 2001 From: Aizistral Date: Thu, 19 Nov 2026 00:29:01 +0100 Subject: Make enableMod a startup-only switch in common config --- .../nochatreports/loader/LoaderPaths.java | 17 +++++++++++++++++ .../nochatreports/neoforge/NoChatReports.java | 22 ++++++---------------- .../neoforge/nochatreports-neoforge.mixins.json | 1 + 3 files changed, 24 insertions(+), 16 deletions(-) create mode 100644 neoforge/src/main/java/com/aizistral/nochatreports/loader/LoaderPaths.java (limited to 'neoforge') diff --git a/neoforge/src/main/java/com/aizistral/nochatreports/loader/LoaderPaths.java b/neoforge/src/main/java/com/aizistral/nochatreports/loader/LoaderPaths.java new file mode 100644 index 0000000..8f4e23a --- /dev/null +++ b/neoforge/src/main/java/com/aizistral/nochatreports/loader/LoaderPaths.java @@ -0,0 +1,17 @@ +package com.aizistral.nochatreports.loader; + +import java.nio.file.Path; + +import net.neoforged.fml.loading.FMLPaths; + +public final class LoaderPaths { + + private LoaderPaths() { + throw new IllegalStateException("Can't touch this"); + } + + public static Path getConfigDir() { + return FMLPaths.CONFIGDIR.get(); + } + +} diff --git a/neoforge/src/main/java/com/aizistral/nochatreports/neoforge/NoChatReports.java b/neoforge/src/main/java/com/aizistral/nochatreports/neoforge/NoChatReports.java index 11071ec..8591a3f 100644 --- a/neoforge/src/main/java/com/aizistral/nochatreports/neoforge/NoChatReports.java +++ b/neoforge/src/main/java/com/aizistral/nochatreports/neoforge/NoChatReports.java @@ -1,6 +1,7 @@ package com.aizistral.nochatreports.neoforge; import com.aizistral.nochatreports.common.NCRCore; +import com.aizistral.nochatreports.common.config.NCRConfig; import com.aizistral.nochatreports.common.platform.PlatformProvider; import com.aizistral.nochatreports.common.platform.events.ClientEvents; import net.minecraft.client.Minecraft; @@ -8,13 +9,10 @@ import net.minecraft.client.multiplayer.ClientPacketListener; import net.neoforged.api.distmarker.Dist; import net.neoforged.api.distmarker.OnlyIn; import net.neoforged.neoforge.client.event.ClientPlayerNetworkEvent; -import net.neoforged.neoforge.event.server.ServerStartedEvent; -import net.neoforged.bus.api.SubscribeEvent; -import net.neoforged.fml.common.EventBusSubscriber; -import net.neoforged.fml.common.EventBusSubscriber.Bus; import net.neoforged.fml.common.Mod; import net.neoforged.fml.loading.FMLEnvironment; import net.neoforged.fml.loading.FMLPaths; +import net.neoforged.neoforge.common.NeoForge; import java.nio.file.Path; @@ -23,6 +21,10 @@ public class NoChatReports implements PlatformProvider { public NoChatReports() { NCRCore.awaken(this); + + if (NCRConfig.isModRunning() && this.isOnClient()) { + NeoForge.EVENT_BUS.addListener(ClientPlayerNetworkEvent.LoggingIn.class, Events::onPlayReady); + } } @Override @@ -39,16 +41,9 @@ public class NoChatReports implements PlatformProvider { public Path getMinecraftDir() { return FMLPaths.GAMEDIR.get(); } - - @Override - public Path getConfigDir() { - return FMLPaths.CONFIGDIR.get(); - } - @EventBusSubscriber(modid = "nochatreports", bus = Bus.GAME) public static class Events { - @SubscribeEvent @OnlyIn(Dist.CLIENT) public static void onPlayReady(ClientPlayerNetworkEvent.LoggingIn event) { Minecraft client = Minecraft.getInstance(); @@ -56,11 +51,6 @@ public class NoChatReports implements PlatformProvider { ClientEvents.PLAY_READY.invoker().handle(handler, client); } - @SubscribeEvent - public static void onServerStarted(ServerStartedEvent event) { - // NO-OP, see https://github.com/Aizistral-Studios/No-Chat-Reports/issues/473 - } - } } diff --git a/neoforge/src/main/resources/mixins/neoforge/nochatreports-neoforge.mixins.json b/neoforge/src/main/resources/mixins/neoforge/nochatreports-neoforge.mixins.json index 809694f..46a6524 100644 --- a/neoforge/src/main/resources/mixins/neoforge/nochatreports-neoforge.mixins.json +++ b/neoforge/src/main/resources/mixins/neoforge/nochatreports-neoforge.mixins.json @@ -2,6 +2,7 @@ "required": true, "minVersion": "0.8", "package": "com.aizistral.nochatreports.neoforge.mixins", + "plugin": "com.aizistral.nochatreports.common.NCRMixinPlugin", "compatibilityLevel": "JAVA_18", "mixins": [], "client": [ -- cgit v1.2.3