MidnightLib 1.5.1 - Fix AutoModMenu opt-out

gradle.properties

@@ -3,16 +3,16 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 	# check these on https://fabricmc.net/use
-	minecraft_version=22w19a
+	minecraft_version=1.19-rc2
-	yarn_mappings=22w19a+build.1
+	yarn_mappings=1.19-rc2+build.1
-	loader_version=0.14.5
+	loader_version=0.14.6
 
 # Mod Properties
-	mod_version = 0.4.1
+	mod_version = 0.5.1
 	maven_group = eu.midnightdust
 	archives_base_name = midnightlib
 
 # Dependencies
 	# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
-	fabric_version=0.52.3+1.19
+	fabric_version=0.55.1+1.19
-	mod_menu_version = 2.0.2
+	mod_menu_version = 4.0.0-beta.4

src/main/java/eu/midnightdust/core/MidnightLibClient.java

@@ -3,6 +3,7 @@ package eu.midnightdust.core;
 import eu.midnightdust.core.config.MidnightLibConfig;
 import eu.midnightdust.hats.web.HatLoader;
 import eu.midnightdust.hats.witch.WitchHatFeatureRenderer;
+import eu.midnightdust.lib.config.AutoModMenu;
 import eu.midnightdust.lib.config.MidnightConfig;
 import eu.midnightdust.lib.util.MidnightColorUtil;
 import net.fabricmc.api.ClientModInitializer;
@@ -16,6 +17,7 @@ public class MidnightLibClient implements ClientModInitializer {
     @Override
     public void onInitializeClient() {
         MidnightConfig.init("midnightlib", MidnightLibConfig.class);
+        AutoModMenu.hideFromModMenu("puzzle");
 
         EntityModelLayerRegistry.registerModelLayer(WitchHatFeatureRenderer.WITCH_HAT_MODEL_LAYER, WitchHatFeatureRenderer::getTexturedModelData);
         if (MidnightLibConfig.special_hats) HatLoader.init();

src/main/java/eu/midnightdust/core/screen/MidnightConfigOverviewScreen.java

@@ -8,9 +8,9 @@ import net.minecraft.client.font.TextRenderer;
 import net.minecraft.client.gui.Element;
 import net.minecraft.client.gui.Selectable;
 import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.gui.screen.ScreenTexts;
 import net.minecraft.client.gui.widget.*;
 import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.screen.ScreenTexts;
 import net.minecraft.text.*;
 import java.util.*;
 

src/main/java/eu/midnightdust/lib/config/AutoCommand.java

@@ -4,7 +4,7 @@ import com.mojang.brigadier.arguments.DoubleArgumentType;
 import com.mojang.brigadier.arguments.IntegerArgumentType;
 import com.mojang.brigadier.arguments.StringArgumentType;
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
-import net.fabricmc.fabric.api.command.v1.CommandRegistrationCallback;
+import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback;
 import net.minecraft.server.command.CommandManager;
 import net.minecraft.server.command.ServerCommandSource;
 import net.minecraft.text.Text;
@@ -27,7 +27,7 @@ public class AutoCommand {
         command();
         LiteralArgumentBuilder<ServerCommandSource> finalized = CommandManager.literal("midnightconfig").requires(source -> source.hasPermissionLevel(2)).then(command);
 
-        CommandRegistrationCallback.EVENT.register((dispatcher, dedicated) -> dispatcher.register(finalized));
+        CommandRegistrationCallback.EVENT.register((dispatcher, dedicated, registrationEnvironment) -> dispatcher.register(finalized));
     }
 
     private void command() {

src/main/java/eu/midnightdust/lib/config/AutoModMenu.java

@@ -4,10 +4,14 @@ import com.terraformersmc.modmenu.api.ConfigScreenFactory;
 import com.terraformersmc.modmenu.api.ModMenuApi;
 import eu.midnightdust.core.config.MidnightLibConfig;
 
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 public class AutoModMenu implements ModMenuApi {
+    protected static List<String> hiddenMods = new ArrayList<>();
+
     @Override
     public ConfigScreenFactory<?> getModConfigScreenFactory() {
         return parent -> MidnightLibConfig.getScreen(parent,"midnightlib");
@@ -16,7 +20,14 @@ public class AutoModMenu implements ModMenuApi {
     @Override
     public Map<String, ConfigScreenFactory<?>> getProvidedConfigScreenFactories() {
         HashMap<String, ConfigScreenFactory<?>> map = new HashMap<>();
-        MidnightConfig.configClass.forEach((modid, cClass) -> map.put(modid, parent -> MidnightConfig.getScreen(parent, modid)));
+        MidnightConfig.configClass.forEach((modid, cClass) -> {
+                    if (!hiddenMods.contains(modid))
+                        map.put(modid, parent -> MidnightConfig.getScreen(parent, modid));
+                }
+        );
         return map;
     }
-}
+    public static void hideFromModMenu(String hiddenMod) {
+        hiddenMods.add(hiddenMod);
+    }
+}

src/main/java/eu/midnightdust/lib/config/MidnightConfig.java

@@ -13,13 +13,13 @@ import net.minecraft.client.gui.DrawableHelper;
 import net.minecraft.client.gui.Element;
 import net.minecraft.client.gui.Selectable;
 import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.gui.screen.ScreenTexts;
 import net.minecraft.client.gui.widget.ButtonWidget;
 import net.minecraft.client.gui.widget.ClickableWidget;
 import net.minecraft.client.gui.widget.ElementListWidget;
 import net.minecraft.client.gui.widget.TextFieldWidget;
 import net.minecraft.client.resource.language.I18n;
 import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.screen.ScreenTexts;
 import net.minecraft.text.Style;
 import net.minecraft.text.Text;
 import net.minecraft.util.Formatting;

src/main/resources/fabric.mod.json

@@ -32,13 +32,9 @@
   },
 
   "mixins": [
-    "midnightcore.mixins.json"
+    "midnightlib.mixins.json"
   ],
 
-  "depends": {
-    "fabric-renderer-registries-v1": "*"
-  },
-
   "custom": {
     "modmenu": {
       "links": {