Use client commands on 1.18+ for /mfrc

Author: embeddedt

forge/src/main/java/org/embeddedt/modernfix/forge/init/ModernFixClientForge.java

@@ -1,13 +1,15 @@
 package org.embeddedt.modernfix.forge.init;
 
 import com.mojang.blaze3d.platform.InputConstants;
+import com.mojang.brigadier.builder.LiteralArgumentBuilder;
 import net.minecraft.client.KeyMapping;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.components.DebugScreenOverlay;
+import net.minecraft.commands.CommandSourceStack;
 import net.minecraftforge.client.ClientRegistry;
 import net.minecraftforge.client.ConfigGuiHandler;
-import net.minecraftforge.client.event.ClientChatEvent;
 import net.minecraftforge.client.event.RecipesUpdatedEvent;
+import net.minecraftforge.client.event.RegisterClientCommandsEvent;
 import net.minecraftforge.client.event.RenderGameOverlayEvent;
 import net.minecraftforge.client.gui.ForgeIngameGui;
 import net.minecraftforge.client.settings.KeyConflictContext;
@@ -55,13 +57,12 @@ public void onConfigKey(TickEvent.ClientTickEvent event) {
     }
 
     @SubscribeEvent(priority = EventPriority.LOW)
-    public void onClientChat(ClientChatEvent event) {
-        if(event.getMessage() != null && event.getMessage().trim().equals("/mfrc")) {
-            NightConfigFixer.runReloads();
-            event.setCanceled(true);
-            // add it to chat history
-            Minecraft.getInstance().gui.getChat().addRecentChat(event.getMessage());
-        }
+    public void onClientChat(RegisterClientCommandsEvent event) {
+        event.getDispatcher().register(LiteralArgumentBuilder.<CommandSourceStack>literal("mfrc")
+                .executes(context -> {
+                    NightConfigFixer.runReloads();
+                    return 1;
+                }));
     }
 
     private static final List<String> brandingList = new ArrayList<>();

forge/src/main/java/org/embeddedt/modernfix/forge/init/ModernFixForge.java

@@ -58,8 +58,7 @@ public ModernFixForge() {
 
     @SubscribeEvent
     public void onCommandRegister(RegisterCommandsEvent event) {
-        // Register separate commands since redirecting doesn't work without arguments
-        for(String name : new String[] { "mfrc", "mfsrc"}) {
+        for(String name : new String[] { "mfsrc"}) {
             event.getDispatcher().register(LiteralArgumentBuilder.<CommandSourceStack>literal(name)
                     .requires(source -> source.hasPermission(3))
                     .executes(context -> {