From 0e2edef8eae1f0b078490f2923347b2183edfcfc Mon Sep 17 00:00:00 2001 From: Aizistral Date: Wed, 18 Nov 2026 23:56:46 +0100 Subject: Make enableMod a startup-only switch in common config --- .../aizistral/nochatreports/forge/NoChatReports.java | 16 ++++++---------- .../com/aizistral/nochatreports/loader/LoaderPaths.java | 17 +++++++++++++++++ .../mixins/forge/nochatreports-forge.mixins.json | 1 + 3 files changed, 24 insertions(+), 10 deletions(-) create mode 100644 forge/src/main/java/com/aizistral/nochatreports/loader/LoaderPaths.java (limited to 'forge') diff --git a/forge/src/main/java/com/aizistral/nochatreports/forge/NoChatReports.java b/forge/src/main/java/com/aizistral/nochatreports/forge/NoChatReports.java index 7ca0815..7730ee9 100644 --- a/forge/src/main/java/com/aizistral/nochatreports/forge/NoChatReports.java +++ b/forge/src/main/java/com/aizistral/nochatreports/forge/NoChatReports.java @@ -5,6 +5,7 @@ import java.util.function.Function; import com.aizistral.nochatreports.common.NCRClient; 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; @@ -14,10 +15,7 @@ import net.minecraft.client.multiplayer.ClientPacketListener; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.client.ConfigScreenHandler; import net.minecraftforge.client.event.ClientPlayerNetworkEvent; -import net.minecraftforge.eventbus.api.listener.SubscribeEvent; import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.Mod.EventBusSubscriber; -import net.minecraftforge.fml.common.Mod.EventBusSubscriber.Bus; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; import net.minecraftforge.fml.loading.FMLEnvironment; import net.minecraftforge.fml.loading.FMLPaths; @@ -27,6 +25,11 @@ public class NoChatReports implements PlatformProvider { public NoChatReports(FMLJavaModLoadingContext context) { NCRCore.awaken(this); + + if (NCRConfig.isModRunning() && this.isOnClient()) { + ClientPlayerNetworkEvent.LoggingIn.BUS.addListener(Events::onPlayReady); + } + Function configScreenFactory = NCRClient.getConfigScreen(); if (isOnClient() && configScreenFactory != null) { context.registerExtensionPoint( @@ -52,16 +55,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.FORGE, value = Dist.CLIENT) public static class Events { - @SubscribeEvent public static void onPlayReady(ClientPlayerNetworkEvent.LoggingIn event) { Minecraft client = Minecraft.getInstance(); ClientPacketListener handler = client.getConnection(); diff --git a/forge/src/main/java/com/aizistral/nochatreports/loader/LoaderPaths.java b/forge/src/main/java/com/aizistral/nochatreports/loader/LoaderPaths.java new file mode 100644 index 0000000..751f952 --- /dev/null +++ b/forge/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.minecraftforge.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/forge/src/main/resources/mixins/forge/nochatreports-forge.mixins.json b/forge/src/main/resources/mixins/forge/nochatreports-forge.mixins.json index 6c5e73e..d0ecdd6 100644 --- a/forge/src/main/resources/mixins/forge/nochatreports-forge.mixins.json +++ b/forge/src/main/resources/mixins/forge/nochatreports-forge.mixins.json @@ -2,6 +2,7 @@ "required": true, "minVersion": "0.8", "package": "com.aizistral.nochatreports.forge.mixins", + "plugin": "com.aizistral.nochatreports.common.NCRMixinPlugin", "compatibilityLevel": "JAVA_21", "mixins": [], "client": [ -- cgit v1.2.3