diff options
Diffstat (limited to 'forge/src/main')
3 files changed, 35 insertions, 20 deletions
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..8c59459 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,15 +25,22 @@ public class NoChatReports implements PlatformProvider { public NoChatReports(FMLJavaModLoadingContext context) { NCRCore.awaken(this); - Function<Screen, Screen> configScreenFactory = NCRClient.getConfigScreen(); - if (isOnClient() && configScreenFactory != null) { - context.registerExtensionPoint( - ConfigScreenHandler.ConfigScreenFactory.class, - () -> new ConfigScreenHandler.ConfigScreenFactory( - (minecraft, parent) -> configScreenFactory.apply(parent) - ) - ); - } + + if (NCRConfig.isModRunning() && this.isOnClient()) { + ClientPlayerNetworkEvent.LoggingIn.BUS.addListener(Events::onPlayReady); + } + + if (this.isOnClient()) { + Function<Screen, Screen> configScreenFactory = NCRClient.getConfigScreen(); + if (configScreenFactory != null) { + context.registerExtensionPoint( + ConfigScreenHandler.ConfigScreenFactory.class, + () -> new ConfigScreenHandler.ConfigScreenFactory( + (minecraft, parent) -> configScreenFactory.apply(parent) + ) + ); + } + } } @Override @@ -52,16 +57,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 7d16556..16e8cd5 100644 --- a/forge/src/main/resources/mixins/forge/nochatreports-forge.mixins.json +++ b/forge/src/main/resources/mixins/forge/nochatreports-forge.mixins.json @@ -2,7 +2,7 @@ "required": true, "minVersion": "0.8", "package": "com.aizistral.nochatreports.forge.mixins", - "compatibilityLevel": "JAVA_25", + "plugin": "com.aizistral.nochatreports.common.NCRMixinPlugin", "mixins": [], "client": [ "client.MixinClientConnection", |
