fix(config): invalid TSL loading order

iGoodie · Sep 30, 2019 · f4fc46c · f4fc46c
1 parent 08ca0bd
commit f4fc46c
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 24 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -5,7 +5,7 @@ org.gradle.daemon=false
 
 mod_id=twitchspawn
 mod_group=net.programmer.igoodie
-mod_version=0.3.2
+mod_version=0.3.3
 
 minecraft_version=1.12.2
 forge_version=14.23.3.2655

diff --git a/src/main/java/net/programmer/igoodie/twitchspawn/TwitchSpawn.java b/src/main/java/net/programmer/igoodie/twitchspawn/TwitchSpawn.java
@@ -9,10 +9,7 @@
 import net.minecraftforge.event.RegistryEvent;
 import net.minecraftforge.fml.client.CustomModLoadingErrorDisplayException;
 import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
-import net.minecraftforge.fml.common.event.FMLServerAboutToStartEvent;
-import net.minecraftforge.fml.common.event.FMLServerStartingEvent;
-import net.minecraftforge.fml.common.event.FMLServerStoppingEvent;
+import net.minecraftforge.fml.common.event.*;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import net.minecraftforge.fml.common.gameevent.PlayerEvent;
 import net.minecraftforge.fml.relauncher.Side;
@@ -26,6 +23,8 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
+import java.io.File;
+
 @Mod(modid = TwitchSpawn.MOD_ID, name = "TwitchSpawn", version = TwitchSpawn.MOD_VERSION)
 public class TwitchSpawn {
 
@@ -42,20 +41,28 @@ public void preInit(final FMLPreInitializationEvent event) {
             MinecraftForge.EVENT_BUS.register(StatusIndicatorOverlay.class);
         }
 
-        try {
-            ConfigManager.loadConfigs(event.getModConfigurationDirectory());
-            NetworkManager.initialize();
+        NetworkManager.initialize();
 
-//            ArgumentTypes.register("twitchspawn:streamer", StreamerArgumentType.class,
-//                    new ArgumentSerializer<>(StreamerArgumentType::streamerNick));
-//            ArgumentTypes.register("twitchspawn:ruleset", RulesetNameArgumentType.class,
-//                    new ArgumentSerializer<>(RulesetNameArgumentType::rulesetName));
+        // Set configurations folder path
+        String configsFolder = event.getModConfigurationDirectory().getPath();
+        ConfigManager.CONFIGS_DIR_PATH = configsFolder;
+        ConfigManager.TWITCH_SPAWN_CONFIG_DIR_PATH = configsFolder + File.separator + "TwitchSpawn";
 
-        } catch (TwitchSpawnLoadingErrors e) {
+        LOGGER.info("preInit()");
+    }
+
+    @Mod.EventHandler
+    public void init(final FMLInitializationEvent event) {
+        LOGGER.info("init()");
+    }
+
+    @Mod.EventHandler
+    public void postInit(final FMLPostInitializationEvent event) {
+        try { ConfigManager.loadConfigs(); } catch (TwitchSpawnLoadingErrors e) {
             e.display();
         }
 
-        LOGGER.info("preInit()");
+        LOGGER.info("postInit()");
     }
 
     @SubscribeEvent

diff --git a/src/main/java/net/programmer/igoodie/twitchspawn/configuration/ConfigManager.java b/src/main/java/net/programmer/igoodie/twitchspawn/configuration/ConfigManager.java
@@ -8,29 +8,21 @@
 
 public class ConfigManager {
 
+    // Filesystem paths - Must be set on preInit()
     public static String CONFIGS_DIR_PATH;
     public static String TWITCH_SPAWN_CONFIG_DIR_PATH;
 
+    // Configuration objects
     public static CredentialsConfig CREDENTIALS;
     public static TSLRulesetCollection RULESET_COLLECTION;
     public static TitlesConfig TITLES;
     public static SubtitlesConfig SUBTITLES;
     public static PreferencesConfig PREFERENCES;
 
     public static void loadConfigs() throws TwitchSpawnLoadingErrors {
-        if(TWITCH_SPAWN_CONFIG_DIR_PATH == null)
-            throw new IllegalArgumentException();
-
-        loadConfigs(new File(CONFIGS_DIR_PATH));
-    }
-
-    public static void loadConfigs(File configsDir) throws TwitchSpawnLoadingErrors {
         TwitchSpawn.LOGGER.info("Loading configs...");
         TwitchSpawnLoadingErrors errors = new TwitchSpawnLoadingErrors();
 
-        CONFIGS_DIR_PATH = configsDir.getPath();
-        TWITCH_SPAWN_CONFIG_DIR_PATH = configsDir.getPath() + File.separator + "TwitchSpawn";
-
         File configDirectory = new File(TWITCH_SPAWN_CONFIG_DIR_PATH);
 
         if (!configDirectory.exists())