Make order of internal reload event listeners consistent

Hexaoxide · Jul 12, 2023 · 702f5ad · 702f5ad
1 parent ef62dc2
commit 702f5ad
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/common/src/main/java/net/draycia/carbon/common/channels/CarbonChannelRegistry.java b/common/src/main/java/net/draycia/carbon/common/channels/CarbonChannelRegistry.java
@@ -26,6 +26,7 @@
 import com.google.inject.Injector;
 import com.google.inject.Singleton;
 import com.google.inject.TypeLiteral;
+import com.seiama.event.EventConfig;
 import com.seiama.registry.Registry;
 import java.io.IOException;
 import java.nio.file.DirectoryStream;
@@ -115,7 +116,7 @@ public CarbonChannelRegistry(
         this.carbonMessages = carbonMessages;
         this.eventHandler = events;
 
-        events.subscribe(CarbonReloadEvent.class, event -> this.reloadConfigChannels());
+        events.subscribe(CarbonReloadEvent.class, -99, EventConfig.DEFAULT_ACCEPTS_CANCELLED, event -> this.reloadConfigChannels());
     }
 
     public static ConfigurationTransformation.Versioned versioned() {

diff --git a/common/src/main/java/net/draycia/carbon/common/config/ConfigFactory.java b/common/src/main/java/net/draycia/carbon/common/config/ConfigFactory.java
@@ -21,6 +21,7 @@
 
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
+import com.seiama.event.EventConfig;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -56,7 +57,7 @@ public ConfigFactory(
         this.dataDirectory = dataDirectory;
         this.locale = locale;
 
-        events.subscribe(CarbonReloadEvent.class, event -> this.reloadPrimaryConfig());
+        events.subscribe(CarbonReloadEvent.class, -100, EventConfig.DEFAULT_ACCEPTS_CANCELLED, event -> this.reloadPrimaryConfig());
     }
 
     public @Nullable PrimaryConfig reloadPrimaryConfig() {

diff --git a/common/src/main/java/net/draycia/carbon/common/messages/CarbonMessageSource.java b/common/src/main/java/net/draycia/carbon/common/messages/CarbonMessageSource.java
@@ -21,6 +21,7 @@
 
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
+import com.seiama.event.EventConfig;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -86,7 +87,7 @@ private CarbonMessageSource(
 
         this.reloadTranslations();
 
-        events.subscribe(CarbonReloadEvent.class, event -> {
+        events.subscribe(CarbonReloadEvent.class, -99, EventConfig.DEFAULT_ACCEPTS_CANCELLED, event -> {
             this.reloadTranslations();
         });
     }