Merge 1.21.7 ModMenuApi fix (#535)

* Fix ModMenuApi implementation (#528)

* Build 1.21.8-v2.15.0 coming right up

* Add 1.21.8 to supported Minecraft versions

---------

Co-authored-by: litetex <40789489+litetex@users.noreply.github.com>

Author: Aizistral

build.gradle

@@ -157,6 +157,7 @@ curseforge {
         changelog = file('docs/CHANGELOG.md')
 		mainArtifact(remapJar)
 
+		addGameVersion "1.21.8"
 		addGameVersion project.minecraft_version
 		addGameVersion "1.21.9"
 		addGameVersion 'Fabric'

docs/CHANGELOG.md

@@ -1,3 +1,7 @@
+#### **\[Build 1.21.8-v2.15.0\]:**
+
+- Fixed "broken implementation of ModMenuApi" crash ([thanks to litetex, #528](https://github.com/Aizistral-Studios/No-Chat-Reports/pull/528)).
+
 #### **\[Build 1.21.7-v2.14.0\]:**
 
 - Initial 1.21.7 port ([thanks to sarunint, #524](https://github.com/Aizistral-Studios/No-Chat-Reports/pull/524));

forge/build.gradle

@@ -194,6 +194,7 @@ curseforge {
         changelogType = 'markdown'
         changelog = rootProject.file('docs/CHANGELOG.md')
 
+		addGameVersion "1.21.8"
 		addGameVersion project.minecraft_version
 		addGameVersion "1.21.6"
 		addGameVersion "Java 21"
@@ -212,7 +213,7 @@ modrinth {
     versionType = "${version_type}"
 	changelog = rootProject.file("docs/CHANGELOG.md").text
     uploadFile = jar
-    gameVersions = [ project.minecraft_version, "1.21.6" ]
+    gameVersions = [ "1.21.8", project.minecraft_version, "1.21.6" ]
 
 	syncBodyFrom = rootProject.file("docs/README.md").text
 }

neoforge/build.gradle

@@ -169,6 +169,7 @@ curseforge {
         changelogType = 'markdown'
         changelog = rootProject.file('docs/CHANGELOG.md')
 
+		addGameVersion "1.21.8"
 		addGameVersion project.minecraft_version
 		addGameVersion "1.21.6"
 		addGameVersion "Java 21"
@@ -187,7 +188,7 @@ modrinth {
     versionType = "${version_type}"
 	changelog = rootProject.file("docs/CHANGELOG.md").text
     uploadFile = jar
-    gameVersions = [ project.minecraft_version, "1.21.6" ]
+    gameVersions = [ "1.21.8", project.minecraft_version, "1.21.6" ]
 
 	syncBodyFrom = rootProject.file("docs/README.md").text
 }

src/main/java/com/aizistral/nochatreports/common/config/ModMenuIntegration.java

@@ -1,44 +1,25 @@
 package com.aizistral.nochatreports.common.config;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Stream;
-
 import com.aizistral.nochatreports.common.NCRCore;
-import com.aizistral.nochatreports.common.core.ServerSafetyState;
-import com.aizistral.nochatreports.common.core.SigningMode;
-import com.aizistral.nochatreports.common.gui.FontHelper;
 import com.terraformersmc.modmenu.api.ConfigScreenFactory;
 import com.terraformersmc.modmenu.api.ModMenuApi;
 
-import me.shedaniel.clothconfig2.api.ConfigBuilder;
-import me.shedaniel.clothconfig2.api.ConfigCategory;
-import me.shedaniel.clothconfig2.api.ConfigEntryBuilder;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
-import net.minecraft.ChatFormatting;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.screens.Screen;
-import net.minecraft.locale.Language;
-import net.minecraft.network.chat.ClickEvent;
-import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.HoverEvent;
 
 /**
  * Implementation of ModMenu and ClothConfig support for the mod.
- * @author MODKILLER1001
  */
-
 @Environment(EnvType.CLIENT)
 public final class ModMenuIntegration implements ModMenuApi {
 
 	@Override
 	public ConfigScreenFactory<?> getModConfigScreenFactory() {
-		if (!ClothConfigIntegration.ACTIVE) {
-			NCRCore.LOGGER.warn("ClothConfig API not found, cannot provide config screen factory.");
-			return null;
-		} else
+		if (ClothConfigIntegration.ACTIVE) {
 			return ClothConfigIntegration::getConfigScreen;
-	}
+		}
 
-}
+		NCRCore.LOGGER.warn("ClothConfig API not found, cannot provide config screen factory.");
+		return ModMenuApi.super.getModConfigScreenFactory();
+	}
+}