From ef4ad35923103792d8e321d25e53aa396f36223d Mon Sep 17 00:00:00 2001 From: HypherionMC Date: Tue, 2 Jan 2024 02:06:56 +0200 Subject: [PATCH] [CHORE] Try to improve invalid config error messages --- gradle.properties | 2 +- .../java/com/hypherionmc/sdlink/core/config/SDLinkConfig.java | 2 ++ .../java/com/hypherionmc/sdlink/core/discord/BotController.java | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 6973081..afb6079 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ version_major=0 version_minor=0 -version_patch=56 +version_patch=57 shade_group=com.hypherionmc.sdlink.shaded. diff --git a/src/main/java/com/hypherionmc/sdlink/core/config/SDLinkConfig.java b/src/main/java/com/hypherionmc/sdlink/core/config/SDLinkConfig.java index 4f0a498..3a6280a 100644 --- a/src/main/java/com/hypherionmc/sdlink/core/config/SDLinkConfig.java +++ b/src/main/java/com/hypherionmc/sdlink/core/config/SDLinkConfig.java @@ -25,6 +25,7 @@ public class SDLinkConfig extends ModuleConfig { // WILL TRY TO WRITE THESE TO THE CONFIG public transient static SDLinkConfig INSTANCE; public transient static int configVer = 13; + public transient static boolean hasConfigLoaded = false; @Path("general") @SpecComment("General Mod Config") @@ -104,6 +105,7 @@ public class SDLinkConfig extends ModuleConfig { @Override public void configReloaded() { INSTANCE = loadConfig(this); + hasConfigLoaded = true; } /** diff --git a/src/main/java/com/hypherionmc/sdlink/core/discord/BotController.java b/src/main/java/com/hypherionmc/sdlink/core/discord/BotController.java index a503cf5..3c5d250 100644 --- a/src/main/java/com/hypherionmc/sdlink/core/discord/BotController.java +++ b/src/main/java/com/hypherionmc/sdlink/core/discord/BotController.java @@ -95,7 +95,7 @@ public class BotController { * Start the bot and handle all the startup work */ public void initializeBot() { - if (SDLinkConfig.INSTANCE == null) { + if (SDLinkConfig.INSTANCE == null || !SDLinkConfig.hasConfigLoaded) { logger.error("Failed to load config. Check your log for errors"); return; }