Fix Commands Not being Registered on NeoForge

Author: JT122406

CHANGELOG.md

@@ -1,5 +1,6 @@
 # 6.0.0.2
 - Move Night Config Shutdown to Fabric Server Lifecycle Event
+- Fix Commands Not being Registered on NeoForge
 
 # 6.0.0.1
 * Fix concurrency issues with random scheduled ticks.

Forge/src/main/java/corgitaco/corgilib/forge/CorgiLibForge.java

@@ -3,6 +3,8 @@
 import corgitaco.corgilib.CorgiLib;
 import corgitaco.corgilib.forge.network.ForgeNetworkHandler;
 import corgitaco.corgilib.forge.platform.ForgePlatform;
+import corgitaco.corgilib.server.commands.CorgiLibCommands;
+import net.minecraftforge.event.RegisterCommandsEvent;
 import net.minecraftforge.eventbus.api.IEventBus;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
@@ -14,13 +16,10 @@ public class CorgiLibForge {
 
     public CorgiLibForge(final FMLJavaModLoadingContext context) {
         IEventBus modEventBus = context.getModEventBus();
-        modEventBus.addListener(this::commonSetup);
+        modEventBus.addListener((FMLCommonSetupEvent event) -> ForgeNetworkHandler.init());
         CorgiLib.init();
         ForgePlatform.CACHED.values().forEach(deferredRegister -> deferredRegister.register(modEventBus));
         modEventBus.<DataPackRegistryEvent.NewRegistry>addListener(newRegistry -> ForgePlatform.DATAPACK_REGISTRIES.forEach(newRegistryConsumer -> newRegistryConsumer.accept(newRegistry)));
-    }
-
-    private void commonSetup(final FMLCommonSetupEvent event) {
-        ForgeNetworkHandler.init();
+        modEventBus.addListener((RegisterCommandsEvent event) -> CorgiLibCommands.registerCommands(event.getDispatcher(), event.getBuildContext()));
     }
 }

Forge/src/main/java/corgitaco/corgilib/forge/CorgiLibForgeEvents.java

@@ -1,9 +1,11 @@
 package dev.corgitaco.corgilib.neoforge;
 
 import corgitaco.corgilib.CorgiLib;
+import corgitaco.corgilib.server.commands.CorgiLibCommands;
 import dev.corgitaco.corgilib.neoforge.platform.NeoForgePlatform;
 import net.neoforged.bus.api.IEventBus;
 import net.neoforged.fml.common.Mod;
+import net.neoforged.neoforge.event.RegisterCommandsEvent;
 import net.neoforged.neoforge.registries.DataPackRegistryEvent;
 import net.neoforged.neoforge.registries.NewRegistryEvent;
 
@@ -17,5 +19,6 @@ public CorgiLibNeoForge(IEventBus modEventBus) {
         NeoForgePlatform.CACHED.values().forEach(deferredRegister -> deferredRegister.register(modEventBus));
         modEventBus.addListener(DataPackRegistryEvent.NewRegistry.class, newRegistry -> NeoForgePlatform.DATAPACK_REGISTRIES.forEach(newRegistryConsumer -> newRegistryConsumer.accept(newRegistry)));
         modEventBus.addListener(NewRegistryEvent.class, newRegistry -> NeoForgePlatform.NEW_REGISTRIES.forEach(newRegistryConsumer -> newRegistryConsumer.accept(newRegistry)));
+        modEventBus.addListener((RegisterCommandsEvent event) -> CorgiLibCommands.registerCommands(event.getDispatcher(), event.getBuildContext()));
     }
 }