From e802f9334a36987da0cdb9a0b9ff97f245aae777 Mon Sep 17 00:00:00 2001 From: Aizistral Date: Sat, 11 Oct 2025 04:36:01 -0700 Subject: 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>--- .../common/config/ModMenuIntegration.java | 31 +++++----------------- 1 file changed, 6 insertions(+), 25 deletions(-) (limited to 'src/main/java/com/aizistral/nochatreports') 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(); + } +} -- cgit v1.2.3