Update NeoForge

CHANGELOG.md

@@ -1,3 +1,3 @@
-### 6.0.0
+### 6.0.1
 
-- Update to 1.21
+- Update NeoForge

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id("dev.nanite.mlp") version("0.1.10")
+    id("dev.nanite.mlp") version("0.2.0")
     id("java-library")
     id("maven-publish")
     id("me.modmuss50.mod-publish-plugin") version "0.3.0"

gradle.properties

@@ -1,5 +1,5 @@
 # Project
-mod_version=6.0.0
+mod_version=6.0.1
 maven_group=com.unrealdinnerbone
 mod_name=Trenzalore
 mod_author=UnRealDinnerbone
@@ -12,7 +12,7 @@ minecraft_version=1.21
 # Forge
 #//forge_version=49.0.31
 
-neo_version=21.0.0-beta
+neo_version=21.0.61-beta
 # Fabric
 fabric_version=0.100.1+1.21
 fabric_loader_version=0.15.11

neo/src/main/java/com/unrealdinnerbone/trenzalore/TrenzaloreNeo.java

@@ -9,7 +9,6 @@
 public class TrenzaloreNeo {
 
     public TrenzaloreNeo(IEventBus modEventBus) {
-        NeoPlatformHelper.setEventBus(modEventBus);
         Trenzalore.init();
         modEventBus.addListener(TrenzaloreNeo::onCreativeTab);
     }

neo/src/main/java/com/unrealdinnerbone/trenzalore/platform/NeoPlatformHelper.java

@@ -21,7 +21,6 @@
 @ApiStatus.Internal
 public class NeoPlatformHelper implements IPlatformHelper {
 
-    private static IEventBus eventBus;
     private static final Map<ResourceKey<CreativeModeTab>, List<Supplier<? extends Item>>> CREATIVE_TAB_MAP = new HashMap<>();
 
     @Override
@@ -43,7 +42,11 @@ public boolean isModLoaded(String modId) {
     public <T> void registryRegistryObjects(String modId, RegistryObjects<T> registryObjects) {
         DeferredRegister<T> deferredRegister = DeferredRegister.create(registryObjects.registryKey(), modId);
         registryObjects.objects().forEach(registryEntry -> deferredRegister.register(registryEntry.name(), registryEntry.entry()));
-        deferredRegister.register(eventBus);
+        IEventBus modEventBus = ModList.get().getModContainerById(modId).orElseThrow(() -> new IllegalArgumentException("Mod Not Found: " + modId)).getEventBus();
+        if(modEventBus == null) {
+            throw new IllegalArgumentException("Mod Does not have and event bus: " + modId);
+        }
+        deferredRegister.register(modEventBus);
     }
 
     @Override
@@ -60,8 +63,5 @@ public static Map<ResourceKey<CreativeModeTab>, List<Supplier<? extends Item>>>
         return CREATIVE_TAB_MAP;
     }
 
-    public static void setEventBus(IEventBus eventBus) {
-        NeoPlatformHelper.eventBus = eventBus;
-    }
 
 }

settings.gradle

@@ -19,7 +19,7 @@ pluginManagement {
 
     plugins {
         id "org.jetbrains.gradle.plugin.idea-ext" version "1.1.7" apply(false)
-        id 'org.gradle.toolchains.foojay-resolver-convention' version '0.5.0'
+        id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0'
     }
 
 }