diff options
| author | Ryan B | 2025-12-25 20:09:39 +1100 |
|---|---|---|
| committer | GitHub | 2025-12-25 10:09:39 +0100 |
| commit | 05aebdca34e06415552b30117dcccc6b49bf66e1 (patch) | |
| tree | 66b8cb2ef6b02c56753995885d3f1b67602e7f42 | |
| parent | 22d0dd62c32b3b78780597b911e706f877340e7e (diff) | |
feat(config): Add cloth config compat for (Neo)Forge (#506)
* Move fabric ModMenuIntegration to src/main/fabric/config
* Cloth Config hasn't been updated for Forge, so it isn't tested
6 files changed, 69 insertions, 28 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 b2eabac..7ca0815 100644 --- a/forge/src/main/java/com/aizistral/nochatreports/forge/NoChatReports.java +++ b/forge/src/main/java/com/aizistral/nochatreports/forge/NoChatReports.java @@ -1,27 +1,41 @@ package com.aizistral.nochatreports.forge; import java.nio.file.Path; +import java.util.function.Function; +import com.aizistral.nochatreports.common.NCRClient; import com.aizistral.nochatreports.common.NCRCore; import com.aizistral.nochatreports.common.platform.PlatformProvider; import com.aizistral.nochatreports.common.platform.events.ClientEvents; import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.screens.Screen; 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; @Mod("nochatreports") public class NoChatReports implements PlatformProvider { - public NoChatReports() { + 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) + ) + ); + } } @Override 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 404aa5b..680a74d 100644 --- a/neoforge/src/main/java/com/aizistral/nochatreports/neoforge/NoChatReports.java +++ b/neoforge/src/main/java/com/aizistral/nochatreports/neoforge/NoChatReports.java @@ -1,25 +1,37 @@ package com.aizistral.nochatreports.neoforge; +import com.aizistral.nochatreports.common.NCRClient; import com.aizistral.nochatreports.common.NCRCore; import com.aizistral.nochatreports.common.platform.PlatformProvider; import com.aizistral.nochatreports.common.platform.events.ClientEvents; import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.screens.Screen; import net.minecraft.client.multiplayer.ClientPacketListener; import net.neoforged.api.distmarker.Dist; +import net.neoforged.fml.ModLoadingContext; import net.neoforged.neoforge.client.event.ClientPlayerNetworkEvent; import net.neoforged.bus.api.SubscribeEvent; import net.neoforged.fml.common.EventBusSubscriber; import net.neoforged.fml.common.Mod; import net.neoforged.fml.loading.FMLEnvironment; import net.neoforged.fml.loading.FMLPaths; +import net.neoforged.neoforge.client.gui.IConfigScreenFactory; import java.nio.file.Path; +import java.util.function.Function; @Mod("nochatreports") public class NoChatReports implements PlatformProvider { public NoChatReports() { NCRCore.awaken(this); + Function<Screen, Screen> configScreenFactory = NCRClient.getConfigScreen(); + if (isOnClient() && configScreenFactory != null) { + ModLoadingContext.get().registerExtensionPoint( + IConfigScreenFactory.class, + () -> (minecraft, parent) -> configScreenFactory.apply(parent) + ); + } } @Override diff --git a/src/main/java/com/aizistral/nochatreports/common/NCRClient.java b/src/main/java/com/aizistral/nochatreports/common/NCRClient.java index c336163..0f9aff9 100644 --- a/src/main/java/com/aizistral/nochatreports/common/NCRClient.java +++ b/src/main/java/com/aizistral/nochatreports/common/NCRClient.java @@ -1,17 +1,22 @@ package com.aizistral.nochatreports.common; +import java.util.function.Function; + +import com.aizistral.nochatreports.common.config.ClothConfigIntegration; import com.aizistral.nochatreports.common.config.NCRConfig; import com.aizistral.nochatreports.common.core.ServerDataExtension; import com.aizistral.nochatreports.common.core.ServerSafetyLevel; import com.aizistral.nochatreports.common.core.ServerSafetyState; import com.aizistral.nochatreports.common.core.SigningMode; -import com.aizistral.nochatreports.common.platform.PlatformProvider; import com.aizistral.nochatreports.common.platform.events.ClientEvents; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; +import org.jetbrains.annotations.Nullable; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.screens.ChatScreen; +import net.minecraft.client.gui.screens.Screen; import net.minecraft.client.multiplayer.ClientPacketListener; import net.minecraft.network.chat.Component; @@ -30,6 +35,14 @@ public class NCRClient { ClientEvents.PLAY_READY.register(NCRClient::onPlayReady); } + @Nullable + public static Function<Screen, Screen> getConfigScreen() { + if (ClothConfigIntegration.ACTIVE) return ClothConfigIntegration::getConfigScreen; + + NCRCore.LOGGER.warn("ClothConfig API not found, cannot provide config screen factory."); + return null; + } + private static void onDisconnect(Minecraft client) { if (!NCRConfig.getClient().enableMod()) return; diff --git a/src/main/java/com/aizistral/nochatreports/common/config/ModMenuIntegration.java b/src/main/java/com/aizistral/nochatreports/common/config/ModMenuIntegration.java deleted file mode 100644 index 31ce011..0000000 --- a/src/main/java/com/aizistral/nochatreports/common/config/ModMenuIntegration.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.aizistral.nochatreports.common.config; - -import com.aizistral.nochatreports.common.NCRCore; -import com.terraformersmc.modmenu.api.ConfigScreenFactory; -import com.terraformersmc.modmenu.api.ModMenuApi; - -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; - -/** - * Implementation of ModMenu and ClothConfig support for the mod. - */ -@Environment(EnvType.CLIENT) -public final class ModMenuIntegration implements ModMenuApi { - - @Override - public ConfigScreenFactory<?> getModConfigScreenFactory() { - if (ClothConfigIntegration.ACTIVE) { - return ClothConfigIntegration::getConfigScreen; - } - - NCRCore.LOGGER.warn("ClothConfig API not found, cannot provide config screen factory."); - return ModMenuApi.super.getModConfigScreenFactory(); - } -} diff --git a/src/main/java/com/aizistral/nochatreports/fabric/config/ModMenuIntegration.java b/src/main/java/com/aizistral/nochatreports/fabric/config/ModMenuIntegration.java new file mode 100644 index 0000000..86c1ea6 --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/fabric/config/ModMenuIntegration.java @@ -0,0 +1,27 @@ +package com.aizistral.nochatreports.fabric.config; + +import java.util.function.Function; + +import net.minecraft.client.gui.screens.Screen; + +import com.aizistral.nochatreports.common.NCRClient; + +import com.terraformersmc.modmenu.api.ConfigScreenFactory; +import com.terraformersmc.modmenu.api.ModMenuApi; + +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; + +/** + * Implementation of ModMenu and ClothConfig support for the mod. + */ +@Environment(EnvType.CLIENT) +public final class ModMenuIntegration implements ModMenuApi { + + @Override + public ConfigScreenFactory<?> getModConfigScreenFactory() { + Function<Screen, Screen> configScreenFactory = NCRClient.getConfigScreen(); + if (configScreenFactory != null) return configScreenFactory::apply; + return ModMenuApi.super.getModConfigScreenFactory(); + } +} diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index fc13ee8..6762cd9 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -29,7 +29,7 @@ "com.aizistral.nochatreports.fabric.NoChatReportsClient" ], "modmenu": [ - "com.aizistral.nochatreports.common.config.ModMenuIntegration" + "com.aizistral.nochatreports.fabric.config.ModMenuIntegration" ] }, "mixins": [ |
