Fix #500

1 files changed, 18 insertions, 8 deletions

diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/common/plugins/PluginManagerImpl.java b/runtime/src/main/java/me/shedaniel/rei/impl/common/plugins/PluginManagerImpl.java
index 48e818d32..82bc8f518 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/common/plugins/PluginManagerImpl.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/common/plugins/PluginManagerImpl.java
@@ -150,6 +150,24 @@ public class PluginManagerImpl<P extends REIPlugin<?>> implements PluginManager<
     }
     
     @Override
+    public void pre() {
+        List<P> plugins = new ArrayList<>(getPlugins().toList());
+        plugins.sort(Comparator.comparingDouble(P::getPriority).reversed());
+        Collections.reverse(plugins);
+        MutablePair<Stopwatch, String> sectionData = new MutablePair<>(Stopwatch.createUnstarted(), "");
+        pluginSection(sectionData, "pre-register", plugins, REIPlugin::preRegister);
+    }
+    
+    @Override
+    public void post() {
+        List<P> plugins = new ArrayList<>(getPlugins().toList());
+        plugins.sort(Comparator.comparingDouble(P::getPriority).reversed());
+        Collections.reverse(plugins);
+        MutablePair<Stopwatch, String> sectionData = new MutablePair<>(Stopwatch.createUnstarted(), "");
+        pluginSection(sectionData, "post-register", plugins, REIPlugin::postRegister);
+    }
+    
+    @Override
     public void startReload(ReloadStage stage) {
         try {
             reloading = true;
@@ -170,19 +188,11 @@ public class PluginManagerImpl<P extends REIPlugin<?>> implements PluginManager<
             RoughlyEnoughItemsCore.LOGGER.info("Reloading Plugin Manager [%s] stage [%s], registered %d plugins: %s", pluginClass.getSimpleName(), stage.toString(), plugins.size(), CollectionUtils.mapAndJoinToString(plugins, REIPlugin::getPluginProviderName, ", "));
             Collections.reverse(plugins);
             
-            if (stage == ReloadStage.START) {
-                pluginSection(sectionData, "pre-register", plugins, REIPlugin::preRegister);
-            }
-            
             for (Reloadable<P> reloadable : getReloadables()) {
                 Class<?> reloadableClass = reloadable.getClass();
                 pluginSection(sectionData, "reloadable-plugin-" + MoreObjects.firstNonNull(reloadableClass.getSimpleName(), reloadableClass.getName()), plugins, plugin -> reloadable.acceptPlugin(plugin, stage));
             }
             
-            if (stage == ReloadStage.END) {
-                pluginSection(sectionData, "post-register", plugins, REIPlugin::postRegister);
-            }
-            
             for (Reloadable<P> reloadable : reloadables) {
                 Class<?> reloadableClass = reloadable.getClass();
                 try (SectionClosable endReload = section(sectionData, "end-reload-" + MoreObjects.firstNonNull(reloadableClass.getSimpleName(), reloadableClass.getName()))) {