diff options
| author | Aizistral | 2025-10-11 04:36:01 -0700 |
|---|---|---|
| committer | GitHub | 2025-10-11 04:36:01 -0700 |
| commit | e802f9334a36987da0cdb9a0b9ff97f245aae777 (patch) | |
| tree | cd4a996195dd130fdaa613c510e1aba2f82e0b78 | |
| parent | 0c51b46e9a635484dab2cfeae439f98e0da509a1 (diff) | |
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>
| -rw-r--r-- | build.gradle | 1 | ||||
| -rw-r--r-- | docs/CHANGELOG.md | 4 | ||||
| -rw-r--r-- | forge/build.gradle | 3 | ||||
| -rw-r--r-- | neoforge/build.gradle | 3 | ||||
| -rw-r--r-- | src/main/java/com/aizistral/nochatreports/common/config/ModMenuIntegration.java | 31 |
5 files changed, 15 insertions, 27 deletions
diff --git a/build.gradle b/build.gradle index 12f7e63..f4d90cf 100644 --- a/build.gradle +++ b/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' diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 592bf3f..e800d9d 100644 --- a/docs/CHANGELOG.md +++ b/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)); diff --git a/forge/build.gradle b/forge/build.gradle index 4e31818..f52a014 100644 --- a/forge/build.gradle +++ b/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 } diff --git a/neoforge/build.gradle b/neoforge/build.gradle index 8c30275..db799a8 100644 --- a/neoforge/build.gradle +++ b/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 } diff --git a/src/main/java/com/aizistral/nochatreports/common/config/ModMenuIntegration.java b/src/main/java/com/aizistral/nochatreports/common/config/ModMenuIntegration.java index e1817ce..31ce011 100644 --- a/src/main/java/com/aizistral/nochatreports/common/config/ModMenuIntegration.java +++ b/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; - } + } -}
\ No newline at end of file + NCRCore.LOGGER.warn("ClothConfig API not found, cannot provide config screen factory."); + return ModMenuApi.super.getModConfigScreenFactory(); + } +} |
