Fix Forge and NeoForge Crashes on Start up

Author: JT122406

CHANGELOG.md

@@ -1,3 +1,6 @@
+# 6.0.0.3
+- Fix NeoForge and Forge Crashes on Startup
+
 # 6.0.0.2
 - Move Night Config Shutdown to Fabric Server Lifecycle Event
 - Fix Commands Not being Registered on NeoForge

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

@@ -4,6 +4,7 @@
 import corgitaco.corgilib.forge.network.ForgeNetworkHandler;
 import corgitaco.corgilib.forge.platform.ForgePlatform;
 import corgitaco.corgilib.server.commands.CorgiLibCommands;
+import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.RegisterCommandsEvent;
 import net.minecraftforge.eventbus.api.IEventBus;
 import net.minecraftforge.fml.common.Mod;
@@ -20,6 +21,6 @@ public CorgiLibForge(final FMLJavaModLoadingContext context) {
         CorgiLib.init();
         ForgePlatform.CACHED.values().forEach(deferredRegister -> deferredRegister.register(modEventBus));
         modEventBus.<DataPackRegistryEvent.NewRegistry>addListener(newRegistry -> ForgePlatform.DATAPACK_REGISTRIES.forEach(newRegistryConsumer -> newRegistryConsumer.accept(newRegistry)));
-        modEventBus.addListener((RegisterCommandsEvent event) -> CorgiLibCommands.registerCommands(event.getDispatcher(), event.getBuildContext()));
+        MinecraftForge.EVENT_BUS.addListener((RegisterCommandsEvent event) -> CorgiLibCommands.registerCommands(event.getDispatcher(), event.getBuildContext()));
     }
 }

NeoForge/build.gradle.kts

@@ -60,7 +60,7 @@ tasks {
     }
 
     shadowJar {
-        exclude("architectury.common.json", "dev/corgi/corgilib/neoforge/datagen/**")
+        exclude("architectury.common.json", "dev/corgitaco/corgilib/neoforge/datagen/**")
         configurations = listOf(project.configurations.getByName("shadowBundle"))
         archiveClassifier.set("dev-shadow")
         relocate("blue.endless.jankson", "corgitaco.corgilib.shadow.blue.endless.jankson")

NeoForge/src/main/java/dev/corgitaco/corgilib/neoforge/CorgiLibNeoForge.java

@@ -2,9 +2,11 @@
 
 import corgitaco.corgilib.CorgiLib;
 import corgitaco.corgilib.server.commands.CorgiLibCommands;
+import dev.corgitaco.corgilib.neoforge.network.NeoForgeNetworkHandler;
 import dev.corgitaco.corgilib.neoforge.platform.NeoForgePlatform;
 import net.neoforged.bus.api.IEventBus;
 import net.neoforged.fml.common.Mod;
+import net.neoforged.neoforge.common.NeoForge;
 import net.neoforged.neoforge.event.RegisterCommandsEvent;
 import net.neoforged.neoforge.registries.DataPackRegistryEvent;
 import net.neoforged.neoforge.registries.NewRegistryEvent;
@@ -19,6 +21,7 @@ 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()));
+        NeoForge.EVENT_BUS.addListener((RegisterCommandsEvent event) -> CorgiLibCommands.registerCommands(event.getDispatcher(), event.getBuildContext()));
+        modEventBus.addListener(NeoForgeNetworkHandler::register);
     }
 }

NeoForge/src/main/java/dev/corgitaco/corgilib/neoforge/network/NeoForgeNetworkHandler.java

@@ -1,17 +1,11 @@
 package dev.corgitaco.corgilib.neoforge.network;
 
-import corgitaco.corgilib.CorgiLib;
 import corgitaco.corgilib.network.Packet;
-import net.neoforged.bus.api.SubscribeEvent;
-import net.neoforged.fml.common.EventBusSubscriber;
 import net.neoforged.neoforge.network.event.RegisterPayloadHandlersEvent;
 import net.neoforged.neoforge.network.registration.PayloadRegistrar;
 
-@EventBusSubscriber(modid = CorgiLib.MOD_ID, bus = EventBusSubscriber.Bus.MOD)
 public class NeoForgeNetworkHandler {
 
-
-    @SubscribeEvent
     public static void register(final RegisterPayloadHandlersEvent event) {
         final PayloadRegistrar registrar = event.registrar("1");
 

gradle.properties

@@ -1,5 +1,5 @@
 # Project
-version=6.0.0.2
+version=6.0.0.3-SNAPSHOT
 group=dev.corgitaco
 archives_base_name=Corgilib
 

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# Copyright © 2015 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.