Rename RegisterClientReloadListenersEvent

neoforged · Jan 25, 2025 · cb1f642 · cb1f642
1 parent 0031246
commit cb1f642
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 16 deletions.
diff --git a/src/main/java/net/neoforged/neoforge/client/ClientHooks.java b/src/main/java/net/neoforged/neoforge/client/ClientHooks.java
@@ -151,7 +151,7 @@
 import net.neoforged.neoforge.client.event.InputEvent;
 import net.neoforged.neoforge.client.event.ModelEvent;
 import net.neoforged.neoforge.client.event.MovementInputUpdateEvent;
-import net.neoforged.neoforge.client.event.RegisterClientReloadListenersEvent;
+import net.neoforged.neoforge.client.event.AddClientReloadListenerEvent;
 import net.neoforged.neoforge.client.event.RegisterColorHandlersEvent;
 import net.neoforged.neoforge.client.event.RegisterKeyMappingsEvent;
 import net.neoforged.neoforge.client.event.RegisterMaterialAtlasesEvent;
@@ -976,7 +976,7 @@ public static void initClientHooks(Minecraft mc, ReloadableResourceManager resou
         registerSpriteSourceTypes();
         MenuScreens.init();
 
-        var rlEvent = new RegisterClientReloadListenersEvent(resourceManager);
+        var rlEvent = new AddClientReloadListenerEvent(resourceManager);
         ModLoader.postEvent(rlEvent);
         resourceManager.listeners = rlEvent.sortListeners();
 

diff --git a/src/main/java/net/neoforged/neoforge/client/ClientNeoForgeMod.java b/src/main/java/net/neoforged/neoforge/client/ClientNeoForgeMod.java
@@ -32,7 +32,7 @@
 import net.neoforged.neoforge.client.entity.animation.json.AnimationLoader;
 import net.neoforged.neoforge.client.event.ClientPlayerNetworkEvent;
 import net.neoforged.neoforge.client.event.ModelEvent;
-import net.neoforged.neoforge.client.event.RegisterClientReloadListenersEvent;
+import net.neoforged.neoforge.client.event.AddClientReloadListenerEvent;
 import net.neoforged.neoforge.client.event.RegisterColorHandlersEvent;
 import net.neoforged.neoforge.client.event.RegisterItemModelsEvent;
 import net.neoforged.neoforge.client.event.RegisterNamedRenderTypesEvent;
@@ -137,7 +137,7 @@ static void onRegisterModelLoaders(ModelEvent.RegisterLoaders event) {
     }
 
     @SubscribeEvent
-    static void onRegisterReloadListeners(RegisterClientReloadListenersEvent event) {
+    static void onRegisterReloadListeners(AddClientReloadListenerEvent event) {
         event.addListener(NeoListenerNames.CLIENT_MOD_LOADING, ClientModLoader::onResourceReload);
         event.addListener(NeoListenerNames.BRANDING, BrandingControl.resourceManagerReloadListener());
 

diff --git a/...t/RegisterClientReloadListenersEvent.java → ...t/event/AddClientReloadListenerEvent.java b/...t/RegisterClientReloadListenersEvent.java → ...t/event/AddClientReloadListenerEvent.java
@@ -28,11 +28,11 @@
  *
  * <p>This event is fired on the mod-specific event bus, only on the {@linkplain LogicalSide#CLIENT logical client}.</p>
  */
-public class RegisterClientReloadListenersEvent extends SortedReloadListenerEvent implements IModBusEvent {
+public class AddClientReloadListenerEvent extends SortedReloadListenerEvent implements IModBusEvent {
 
     @ApiStatus.Internal
-    public RegisterClientReloadListenersEvent(ReloadableResourceManager resourceManager) {
-        super(resourceManager.listeners, RegisterClientReloadListenersEvent::lookupName);
+    public AddClientReloadListenerEvent(ReloadableResourceManager resourceManager) {
+        super(resourceManager.listeners, AddClientReloadListenerEvent::lookupName);
     }
 
     private static ResourceLocation lookupName(PreparableReloadListener listener) {

diff --git a/src/main/java/net/neoforged/neoforge/client/model/UnbakedModelLoader.java b/src/main/java/net/neoforged/neoforge/client/model/UnbakedModelLoader.java
@@ -12,16 +12,16 @@
 import net.minecraft.client.resources.model.UnbakedModel;
 import net.minecraft.server.packs.resources.ResourceManagerReloadListener;
 import net.neoforged.neoforge.client.event.ModelEvent;
-import net.neoforged.neoforge.client.event.RegisterClientReloadListenersEvent;
+import net.neoforged.neoforge.client.event.AddClientReloadListenerEvent;
 
 /**
  * A loader for custom {@linkplain UnbakedModel unbaked models}.
  * <p>
  * If you do any caching, you should implement {@link ResourceManagerReloadListener} and register it with
- * {@link RegisterClientReloadListenersEvent}.
+ * {@link AddClientReloadListenerEvent}.
  *
  * @see ModelEvent.RegisterLoaders
- * @see RegisterClientReloadListenersEvent
+ * @see AddClientReloadListenerEvent
  */
 public interface UnbakedModelLoader<T extends UnbakedModel> {
     /**

diff --git a/src/main/java/net/neoforged/neoforge/resource/VanillaClientListeners.java b/src/main/java/net/neoforged/neoforge/resource/VanillaClientListeners.java
@@ -30,11 +30,11 @@
 import net.minecraft.client.sounds.SoundManager;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.packs.resources.PreparableReloadListener;
-import net.neoforged.neoforge.client.event.RegisterClientReloadListenersEvent;
+import net.neoforged.neoforge.client.event.AddClientReloadListenerEvent;
 import net.neoforged.neoforge.common.util.VanillaClassToKey;
 
 /**
- * Keys for vanilla {@link PreparableReloadListener reload listeners}, used to specify dependency ordering in the {@link RegisterClientReloadListenersEvent}.
+ * Keys for vanilla {@link PreparableReloadListener reload listeners}, used to specify dependency ordering in the {@link AddClientReloadListenerEvent}.
  * <p>
  * Due to the volume of vanilla listeners, these keys are automatically generated based on the class name.
  * 

diff --git a/tests/src/main/java/net/neoforged/neoforge/debug/client/CustomGlyphProviderTypeTest.java b/tests/src/main/java/net/neoforged/neoforge/debug/client/CustomGlyphProviderTypeTest.java
@@ -18,7 +18,7 @@
 import net.minecraft.util.profiling.ProfilerFiller;
 import net.neoforged.api.distmarker.Dist;
 import net.neoforged.fml.common.asm.enumextension.EnumProxy;
-import net.neoforged.neoforge.client.event.RegisterClientReloadListenersEvent;
+import net.neoforged.neoforge.client.event.AddClientReloadListenerEvent;
 import net.neoforged.neoforge.internal.versions.neoforge.NeoForgeVersion;
 import net.neoforged.testframework.DynamicTest;
 import net.neoforged.testframework.annotation.ForEachTest;
@@ -33,7 +33,7 @@ public class CustomGlyphProviderTypeTest {
 
     @TestHolder(description = "Tests if custom GlyphProviderTypes were used for loading resources", enabledByDefault = true)
     static void setupGlyphProviderTypeTest(DynamicTest test) {
-        test.framework().modEventBus().addListener((RegisterClientReloadListenersEvent event) -> event.addListener(LISTENER_NAME, new SimplePreparableReloadListener<Void>() {
+        test.framework().modEventBus().addListener((AddClientReloadListenerEvent event) -> event.addListener(LISTENER_NAME, new SimplePreparableReloadListener<Void>() {
             @Override
             protected Void prepare(ResourceManager p_10796_, ProfilerFiller p_10797_) {
                 return null;

diff --git a/tests/src/main/java/net/neoforged/neoforge/debug/client/TextureAtlasTests.java b/tests/src/main/java/net/neoforged/neoforge/debug/client/TextureAtlasTests.java
@@ -12,7 +12,7 @@
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.packs.resources.ResourceManagerReloadListener;
 import net.neoforged.api.distmarker.Dist;
-import net.neoforged.neoforge.client.event.RegisterClientReloadListenersEvent;
+import net.neoforged.neoforge.client.event.AddClientReloadListenerEvent;
 import net.neoforged.neoforge.client.event.RegisterMaterialAtlasesEvent;
 import net.neoforged.neoforge.internal.versions.neoforge.NeoForgeVersion;
 import net.neoforged.testframework.DynamicTest;
@@ -34,7 +34,7 @@ static void testMaterialAtlas(final DynamicTest test) {
             event.register(atlasLoc, infoLoc);
         });
 
-        test.framework().modEventBus().addListener(RegisterClientReloadListenersEvent.class, event -> {
+        test.framework().modEventBus().addListener(AddClientReloadListenerEvent.class, event -> {
             event.addListener(LISTENER_NAME, (ResourceManagerReloadListener) manager -> {
                 try {
                     Minecraft.getInstance().getModelManager().getAtlas(atlasLoc);