diff --git a/build.gradle b/build.gradle index 2b19237..8e0f654 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ plugins { mainClassName = 'tech.nevets.modbot.CoreBot' group 'tech.nevets' -version '0.1.0-beta' +version '1.0.0' sourceCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17 diff --git a/src/main/java/tech/nevets/modbot/CoreBot.java b/src/main/java/tech/nevets/modbot/CoreBot.java index 560ff2f..2caffd4 100644 --- a/src/main/java/tech/nevets/modbot/CoreBot.java +++ b/src/main/java/tech/nevets/modbot/CoreBot.java @@ -18,6 +18,7 @@ public class CoreBot { public static JDA jda; public static final Config CORE_CONFIG = new Config("core"); public static final List PLUGIN_LISTENERS = new ArrayList<>(); + private static String botPrefix; private static List modules; private static final Logger LOGGER = LoggerFactory.getLogger(CoreBot.class); @@ -25,6 +26,7 @@ public class CoreBot { setLoggingLevel(Level.INFO); CORE_CONFIG.addDefaults(getDefaults()); CORE_CONFIG.loadConfig(); + botPrefix = CORE_CONFIG.getConfig().getString("bot.prefix"); modules = ModuleLoader.loadModules(); CoreListener coreListener = new CoreListener(); @@ -33,6 +35,7 @@ public class CoreBot { .addEventListeners(coreListener); for (ListenerAdapter listener : PLUGIN_LISTENERS) { + LOGGER.error("Loaded Plugin listener"); builder.addEventListeners(listener); } @@ -67,8 +70,12 @@ public class CoreBot { return defaults; } - public static void setLoggingLevel(Level level) { + private static void setLoggingLevel(Level level) { ch.qos.logback.classic.Logger root = (ch.qos.logback.classic.Logger) LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME); root.setLevel(level); } + + public static String getPrefix() { + return botPrefix; + } } diff --git a/src/main/java/tech/nevets/modbot/util/commands/CoreListener.java b/src/main/java/tech/nevets/modbot/util/commands/CoreListener.java index 7bbc7e4..ab51acd 100644 --- a/src/main/java/tech/nevets/modbot/util/commands/CoreListener.java +++ b/src/main/java/tech/nevets/modbot/util/commands/CoreListener.java @@ -40,7 +40,7 @@ public class CoreListener extends ListenerAdapter { return; } - if (raw.startsWith(CoreBot.CORE_CONFIG.getConfig().getString("bot.prefix"))) { + if (raw.startsWith(CoreBot.getPrefix())) { registry.handle(event); } }