summaryrefslogtreecommitdiffstats
path: root/src/main/java/com/aizistral
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/com/aizistral')
-rw-r--r--src/main/java/com/aizistral/nochatreports/common/NCRClient.java15
-rw-r--r--src/main/java/com/aizistral/nochatreports/common/config/ModMenuIntegration.java25
-rw-r--r--src/main/java/com/aizistral/nochatreports/fabric/config/ModMenuIntegration.java27
3 files changed, 41 insertions, 26 deletions
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();
+ }
+}