Fixed crash when using sign buffering on NeoForge 1.21.4

Author: RaphiMC

common/src/main/java/net/raphimc/immediatelyfast/ImmediatelyFast.java

@@ -105,7 +105,9 @@ public static void windowInit() {
     public static void lateInit() {
         if (config.experimental_sign_text_buffering) {
             signTextCache = new SignTextCache();
-            ((ReloadableResourceManagerImpl) MinecraftClient.getInstance().getResourceManager()).registerReloader(signTextCache);
+            if (!PlatformCode.getModVersion("neoforge").isPresent()) { // NeoForge uses an event. Handled in ImmediatelyFastNeoForge
+                ((ReloadableResourceManagerImpl) MinecraftClient.getInstance().getResourceManager()).registerReloader(signTextCache);
+            }
         }
     }
 

gradle.properties

@@ -8,7 +8,7 @@ supported_minecraft_versions=1.21.4
 yarn_mappings=1.21.4+build.1
 fabric_loader_version=0.16.9
 #forge_version=1.21.3-53.0.11
-neoforge_version=21.4.0-beta
+neoforge_version=21.4.94-beta
 mixin_extras_version=0.4.1
 reflect_version=1.3.4
 

neoforge/src/main/java/net/raphimc/immediatelyfast/neoforge/ImmediatelyFastNeoForge.java

@@ -17,8 +17,25 @@
  */
 package net.raphimc.immediatelyfast.neoforge;
 
+import net.minecraft.resource.SynchronousResourceReloader;
+import net.minecraft.util.Identifier;
+import net.neoforged.bus.api.SubscribeEvent;
+import net.neoforged.fml.common.EventBusSubscriber;
 import net.neoforged.fml.common.Mod;
+import net.neoforged.neoforge.client.event.AddClientReloadListenersEvent;
+import net.raphimc.immediatelyfast.ImmediatelyFast;
 
 @Mod("immediatelyfast")
+@EventBusSubscriber(modid = "immediatelyfast", bus = EventBusSubscriber.Bus.MOD)
 public class ImmediatelyFastNeoForge {
+
+    private static final Identifier SIGN_TEXT_CACHE_RELOAD_LISTENER_ID = Identifier.of("immediatelyfast", "sign_text_cache_reload_listener");
+
+    @SubscribeEvent
+    private static void onAddClientReloadListeners(final AddClientReloadListenersEvent event) {
+        if (ImmediatelyFast.config.experimental_sign_text_buffering) {
+            event.addListener(SIGN_TEXT_CACHE_RELOAD_LISTENER_ID, (SynchronousResourceReloader) manager -> ImmediatelyFast.signTextCache.reload(manager));
+        }
+    }
+
 }

neoforge/src/main/resources/META-INF/neoforge.mods.toml

@@ -18,12 +18,12 @@ config = "immediatelyfast-neoforge.mixins.json"
 [[mixins]]
 config = "immediatelyfast-common.mixins.json"
 
-#[[dependencies.immediatelyfast]]
-#modId = "neoforge"
-#required = true
-#versionRange = "[21.4.0,)"
-#ordering = "NONE"
-#side = "CLIENT"
+[[dependencies.immediatelyfast]]
+modId = "neoforge"
+required = true
+versionRange = "[21.4.84,)"
+ordering = "NONE"
+side = "CLIENT"
 
 [[dependencies.immediatelyfast]]
 modId = "minecraft"