Fixed cconfig

Author: cev-api

src/main/java/dev/xpple/seedmapper/command/commands/EspConfigCommand.java

@@ -58,18 +58,19 @@ private EspConfigCommand() {
     public static void register(CommandDispatcher<FabricClientCommandSource> dispatcher) {
         CommandNode<FabricClientCommandSource> cconfigRoot = dispatcher.getRoot().getChild("cconfig");
         if (cconfigRoot == null) {
-            // If the BetterConfig client command isn't present, register a direct sm:config fallback
+            // BetterConfig client command not present: register direct fallback.
             registerDirectSmConfig(dispatcher);
             return;
         }
+
         CommandNode<FabricClientCommandSource> modRoot = cconfigRoot.getChild(SeedMapper.MOD_ID);
         if (modRoot == null) {
-            // fallback to direct registration if mod-specific cconfig node missing
+            // Mod-specific cconfig node missing: register direct fallback.
             registerDirectSmConfig(dispatcher);
             return;
         }
 
-        // Use a single target argument that accepts any case but suggests TitleCase names
+        // Attach ESP-specific settings to existing sm:config/cconfig tree.
         com.mojang.brigadier.builder.RequiredArgumentBuilder<FabricClientCommandSource, String> targetArgNode = argument("target", StringArgumentType.word())
             .suggests(EspConfigCommand::suggestTargets);
         targetArgNode.then(literal("get")
@@ -82,8 +83,10 @@ public static void register(CommandDispatcher<FabricClientCommandSource> dispatc
                 .executes(ctx -> executeSet(ctx, getTargetArgument(ctx, "target")))));
         targetArgNode.then(literal("reset")
             .executes(ctx -> executeReset(ctx, getTargetArgument(ctx, "target"))));
+
         modRoot.addChild(targetArgNode.build());
         modRoot.addChild(buildZoomLiteral("Zoom").build());
+        modRoot.addChild(buildEspTimeoutLiteral().build());
     }
 
     private static void registerDirectSmConfig(CommandDispatcher<FabricClientCommandSource> dispatcher) {
@@ -103,12 +106,16 @@ private static void registerDirectSmConfig(CommandDispatcher<FabricClientCommand
             .executes(ctx -> executeReset(ctx, getTargetArgument(ctx, "target"))));
         smRoot.then(targetArgNode);
         smRoot.then(buildZoomLiteral("Zoom"));
-        // esptimeout top-level alias
-        smRoot.then(literal("esptimeout")
+        smRoot.then(buildEspTimeoutLiteral());
+        dispatcher.register(smRoot);
+    }
+
+    private static LiteralArgumentBuilder<FabricClientCommandSource> buildEspTimeoutLiteral() {
+        return literal("esptimeout")
             .executes(ctx -> {
                 CustomClientCommandSource source = CustomClientCommandSource.of(ctx.getSource());
                 source.sendFeedback(Component.literal("EspTimeoutMinutes = " + Configs.EspTimeoutMinutes));
-                return 1;
+                return Command.SINGLE_SUCCESS;
             })
             .then(argument("minutes", DoubleArgumentType.doubleArg(0.0))
                 .executes(ctx -> {
@@ -117,9 +124,8 @@ private static void registerDirectSmConfig(CommandDispatcher<FabricClientCommand
                     Configs.save();
                     RenderManager.setHighlightTimeout(Configs.EspTimeoutMinutes);
                     CustomClientCommandSource.of(ctx.getSource()).sendFeedback(Component.literal("Updated EspTimeoutMinutes = " + minutes));
-                    return 1;
-                })));
-        dispatcher.register(smRoot);
+                    return Command.SINGLE_SUCCESS;
+                }));
     }
 
     private static LiteralArgumentBuilder<FabricClientCommandSource> buildZoomLiteral(String literalName) {

src/main/java/dev/xpple/seedmapper/mixin/betterconfig/ConfigCommandClientMixin.java

@@ -11,13 +11,20 @@
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-import static net.fabricmc.fabric.api.client.command.v2.ClientCommandManager.*;
+import static net.fabricmc.fabric.api.client.command.v2.ClientCommandManager.literal;
 
 @Mixin(ConfigCommandClient.class)
 public class ConfigCommandClientMixin {
     @Inject(method = "register", at = @At("TAIL"))
     private static void registerConfigCommand(CommandDispatcher<FabricClientCommandSource> dispatcher, CommandBuildContext buildContext, CallbackInfo ci) {
-        CommandNode<FabricClientCommandSource> configRoot = dispatcher.getRoot().getChild("cconfig").getChild(SeedMapper.MOD_ID);
+        CommandNode<FabricClientCommandSource> cconfigRoot = dispatcher.getRoot().getChild("cconfig");
+        if (cconfigRoot == null) {
+            return;
+        }
+        CommandNode<FabricClientCommandSource> configRoot = cconfigRoot.getChild(SeedMapper.MOD_ID);
+        if (configRoot == null) {
+            return;
+        }
         dispatcher.register(literal("sm:config").redirect(configRoot));
     }
 }