fix: Disable opening config without cloth config installed!

Norbiros · May 7, 2024 · 44b4574 · 44b4574
1 parent 018ea57
commit 44b4574
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/fabric/src/main/java/dev/norbiros/emojitype/fabric/ModMenuIntegration.java b/fabric/src/main/java/dev/norbiros/emojitype/fabric/ModMenuIntegration.java
@@ -3,10 +3,15 @@
 import com.terraformersmc.modmenu.api.ConfigScreenFactory;
 import com.terraformersmc.modmenu.api.ModMenuApi;
 import dev.norbiros.emojitype.config.EmojiTypeConfig;
+import net.fabricmc.loader.api.FabricLoader;
 
 public class ModMenuIntegration implements ModMenuApi {
     @Override
     public ConfigScreenFactory<?> getModConfigScreenFactory() {
+        if (!FabricLoader.getInstance().isModLoaded("cloth-config2")) {
+            return null;
+        }
+
         return EmojiTypeConfig::createConfigScreen;
     }
 }
diff --git a/forge/src/main/java/dev/norbiros/emojitype/forge/EmojitypeForge.java b/forge/src/main/java/dev/norbiros/emojitype/forge/EmojitypeForge.java
@@ -2,7 +2,8 @@
 
 import dev.norbiros.emojitype.EmojiType;
 import dev.norbiros.emojitype.config.EmojiTypeConfig;
-import net.minecraftforge.client.ConfigScreenHandler;
+import net.minecraftforge.client.ConfigScreenHandler.ConfigScreenFactory;
+import net.minecraftforge.fml.ModList;
 import net.minecraftforge.fml.ModLoadingContext;
 import net.minecraftforge.fml.common.Mod;
 
@@ -11,6 +12,9 @@ public class EmojitypeForge {
     public EmojitypeForge() {
         EmojiType.init();
 
-        ModLoadingContext.get().registerExtensionPoint(ConfigScreenHandler.ConfigScreenFactory.class, () -> new ConfigScreenHandler.ConfigScreenFactory((client, parent) -> EmojiTypeConfig.createConfigScreen(parent)));
+        if (ModList.get().isLoaded("cloth_config")) {
+            ModLoadingContext.get().registerExtensionPoint(ConfigScreenFactory.class,
+                    () -> new ConfigScreenFactory((client, parent) -> EmojiTypeConfig.createConfigScreen(parent)));
+        }
     }
 }
diff --git a/neoforge/src/main/java/dev/norbiros/emojitype/neoforge/EmojitypeNeoforge.java b/neoforge/src/main/java/dev/norbiros/emojitype/neoforge/EmojitypeNeoforge.java
@@ -2,6 +2,7 @@
 
 import dev.norbiros.emojitype.EmojiType;
 import dev.norbiros.emojitype.config.EmojiTypeConfig;
+import net.neoforged.fml.ModList;
 import net.neoforged.neoforge.client.gui.IConfigScreenFactory;
 import net.neoforged.fml.ModLoadingContext;
 import net.neoforged.fml.common.Mod;
@@ -11,7 +12,9 @@ public class EmojitypeNeoforge {
     public EmojitypeNeoforge() {
         EmojiType.init();
 
-        ModLoadingContext.get().registerExtensionPoint(IConfigScreenFactory.class,
-                () -> (client, parent) -> EmojiTypeConfig.createConfigScreen(parent));
+        if (ModList.get().isLoaded("cloth_config")) {
+            ModLoadingContext.get().registerExtensionPoint(IConfigScreenFactory.class,
+                    () -> (client, parent) -> EmojiTypeConfig.createConfigScreen(parent));
+        }
     }
 }