Merge branch '12.x-1.20' into 13.x-1.20.2

3 files changed, 21 insertions, 1 deletions

diff --git a/api/build.gradle b/api/build.gradle
index 23ee2975c..44b099077 100644
--- a/api/build.gradle
+++ b/api/build.gradle
@@ -31,7 +31,7 @@ task fakeForgeJar(type: Jar, dependsOn: jar) {
     }
     ["REIPlugin", "REIPluginClient", "REIPluginCommon", "REIPluginDedicatedServer",
      "REIPluginLoader", "REIPluginLoaderClient", "REIPluginLoaderCommon", "REIPluginLoaderDedicatedServer"].each {
-        from(rootProject.file("fake/$it.class")) {
+        from(rootProject.file("fake/${it}.class")) {
             into "me/shedaniel/rei/forge"
         }
     }
diff --git a/api/src/main/java/me/shedaniel/rei/api/common/registry/ParentReloadable.java b/api/src/main/java/me/shedaniel/rei/api/common/registry/ParentReloadable.java
index eef0ae964..f128673ef 100644
--- a/api/src/main/java/me/shedaniel/rei/api/common/registry/ParentReloadable.java
+++ b/api/src/main/java/me/shedaniel/rei/api/common/registry/ParentReloadable.java
@@ -61,6 +61,20 @@ public interface ParentReloadable<P extends REIPlugin<?>> extends Reloadable<P>
     }
     
     @Override
+    default void preStage(ReloadStage stage) {
+        for (Reloadable<P> reloadable : getReloadables()) {
+            reloadable.preStage(stage);
+        }
+    }
+    
+    @Override
+    default void postStage(ReloadStage stage) {
+        for (Reloadable<P> reloadable : getReloadables()) {
+            reloadable.postStage(stage);
+        }
+    }
+    
+    @Override
     default void beforeReloadable(ReloadStage stage, Reloadable<P> other) {
         for (Reloadable<P> reloadable : getReloadables()) {
             reloadable.beforeReloadable(stage, other);
diff --git a/api/src/main/java/me/shedaniel/rei/api/common/registry/Reloadable.java b/api/src/main/java/me/shedaniel/rei/api/common/registry/Reloadable.java
index 100a054d6..62d0df7b7 100644
--- a/api/src/main/java/me/shedaniel/rei/api/common/registry/Reloadable.java
+++ b/api/src/main/java/me/shedaniel/rei/api/common/registry/Reloadable.java
@@ -49,6 +49,12 @@ public interface Reloadable<P extends REIPlugin<?>> {
     }
     
     @ApiStatus.Experimental
+    default void preStage(ReloadStage stage) {}
+    
+    @ApiStatus.Experimental
+    default void postStage(ReloadStage stage) {}
+    
+    @ApiStatus.Experimental
     default void beforeReloadable(ReloadStage stage, Reloadable<P> other) {}
     
     @ApiStatus.Experimental