Merge remote-tracking branch 'origin/6.x' into 6.x-1.17

2 files changed, 5 insertions, 5 deletions

diff --git a/api/src/main/java/me/shedaniel/rei/api/common/display/DisplaySerializerRegistry.java b/api/src/main/java/me/shedaniel/rei/api/common/display/DisplaySerializerRegistry.java
index e2e063023..8b2c8c0e1 100644
--- a/api/src/main/java/me/shedaniel/rei/api/common/display/DisplaySerializerRegistry.java
+++ b/api/src/main/java/me/shedaniel/rei/api/common/display/DisplaySerializerRegistry.java
@@ -38,7 +38,7 @@ public interface DisplaySerializerRegistry extends Reloadable<REIPlugin<?>> {
      * Registers a {@link DisplaySerializer} for serializing a {@link Display} for syncing across server-client, and
      * for serializing displays to disk for favorites.
      * <p>
-     * Since REI 6, all {@link me.shedaniel.rei.api.client.registry.display.DisplayCategory}s are required to register their serializers,
+     * Since REI 6, all {@link me.shedaniel.rei.api.client.registry.display.DisplayCategory} are required to register their serializers,
      * or mark themselves as unavailable for serialization.
      *
      * @param categoryId the category identifier of the display
@@ -51,7 +51,7 @@ public interface DisplaySerializerRegistry extends Reloadable<REIPlugin<?>> {
      * Marks a {@link Display} as unavailable to sync across server-client, and
      * for serializing displays to disk for favorites.
      * <p>
-     * Since REI 6, all {@link me.shedaniel.rei.api.client.registry.display.DisplayCategory}s are required to register their serializers,
+     * Since REI 6, all {@link me.shedaniel.rei.api.client.registry.display.DisplayCategory} are required to register their serializers,
      * or mark themselves as unavailable for serialization.
      *
      * @param categoryId the category identifier of the display
diff --git a/api/src/main/java/me/shedaniel/rei/api/common/plugins/PluginManager.java b/api/src/main/java/me/shedaniel/rei/api/common/plugins/PluginManager.java
index 2a74d0493..7a525c045 100644
--- a/api/src/main/java/me/shedaniel/rei/api/common/plugins/PluginManager.java
+++ b/api/src/main/java/me/shedaniel/rei/api/common/plugins/PluginManager.java
@@ -59,11 +59,11 @@ public interface PluginManager<P extends REIPlugin<?>> extends ParentReloadable<
                 () -> () -> Arrays.asList(getInstance(), getServerInstance()));
     }
     
-    static boolean areAnyPluginsReloading() {
-        return CollectionUtils.anyMatch(getActiveInstances(), PluginManager::arePluginsReloading);
+    static boolean areAnyReloading() {
+        return CollectionUtils.anyMatch(getActiveInstances(), PluginManager::isReloading);
     }
     
-    boolean arePluginsReloading();
+    boolean isReloading();
     
     <T extends Reloadable<? super P>> T get(Class<T> reloadableClass);