diff --git a/.gradle/8.1.1/executionHistory/executionHistory.bin b/.gradle/8.1.1/executionHistory/executionHistory.bin index d460802..bb4e045 100644 Binary files a/.gradle/8.1.1/executionHistory/executionHistory.bin and b/.gradle/8.1.1/executionHistory/executionHistory.bin differ diff --git a/.gradle/8.1.1/executionHistory/executionHistory.lock b/.gradle/8.1.1/executionHistory/executionHistory.lock index 4c4eb7c..b6a0820 100644 Binary files a/.gradle/8.1.1/executionHistory/executionHistory.lock and b/.gradle/8.1.1/executionHistory/executionHistory.lock differ diff --git a/.gradle/8.1.1/fileHashes/fileHashes.bin b/.gradle/8.1.1/fileHashes/fileHashes.bin index 68f12f8..d214312 100644 Binary files a/.gradle/8.1.1/fileHashes/fileHashes.bin and b/.gradle/8.1.1/fileHashes/fileHashes.bin differ diff --git a/.gradle/8.1.1/fileHashes/fileHashes.lock b/.gradle/8.1.1/fileHashes/fileHashes.lock index bb2c90a..14b7782 100644 Binary files a/.gradle/8.1.1/fileHashes/fileHashes.lock and b/.gradle/8.1.1/fileHashes/fileHashes.lock differ diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 02dff72..6fb6b1f 100644 Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/.idea/modules.xml b/.idea/modules.xml index 139cfce..69573fd 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,6 +2,7 @@ + diff --git a/src/main/java/me/theclashfruit/yadmb/config/MainConfigModel.java b/src/main/java/me/theclashfruit/yadmb/config/MainConfigModel.java index dc90107..38f8677 100644 --- a/src/main/java/me/theclashfruit/yadmb/config/MainConfigModel.java +++ b/src/main/java/me/theclashfruit/yadmb/config/MainConfigModel.java @@ -1,9 +1,50 @@ package me.theclashfruit.yadmb.config; import io.wispforest.owo.config.annotation.Config; +import io.wispforest.owo.config.annotation.Nest; @Config(name = "yadmb", wrapperName = "MainConfig") public class MainConfigModel { public int schemaVersion = 1; - public String discordToken = ""; + @Nest + public Discord discord = new Discord(); + + public static class Discord { + public String token = ""; + public long channel = 0; + public long guild = 0; + } + + @Nest + public Messages messages = new Messages(); + + public static class Messages { + @Nest + public MessagesDiscord discord = new MessagesDiscord(); + + public static class MessagesDiscord { + @Nest + public ChatMessage chatMessage = new ChatMessage(); + + public static class ChatMessage { + public String content = "${message}"; + + @Nest + public Webhook webhook = new Webhook(); + + public static class Webhook { + public Boolean enabled = true; + public String username = "${username}"; + public String avatarUrl = "https://crafatar.com/avatars/${uuid}"; + } + } + } + + @Nest + public MessagesMinecraft minecraft = new MessagesMinecraft(); + + public static class MessagesMinecraft { + + } + } } diff --git a/src/main/java/me/theclashfruit/yadmb/discord/BotClient.java b/src/main/java/me/theclashfruit/yadmb/discord/BotClient.java index ca21706..298a78f 100644 --- a/src/main/java/me/theclashfruit/yadmb/discord/BotClient.java +++ b/src/main/java/me/theclashfruit/yadmb/discord/BotClient.java @@ -14,7 +14,7 @@ public class BotClient { static JDA jda; public static void createBotClient() throws InterruptedException { - if (YADMB.CONFIG.discordToken().equals("")) { + if (YADMB.CONFIG.discord.token().equals("")) { YADMB.LOGGER.error("Unable to start due to missing discord token!"); return; @@ -27,7 +27,7 @@ public class BotClient { } jda = JDABuilder - .createDefault(YADMB.CONFIG.discordToken(), GatewayIntent.GUILD_MESSAGES, GatewayIntent.MESSAGE_CONTENT) + .createDefault(YADMB.CONFIG.discord.token(), GatewayIntent.GUILD_MESSAGES, GatewayIntent.MESSAGE_CONTENT) .addEventListeners(new ReadyListener()) .addEventListeners(new MessageListener()) .setActivity(Activity.watching("server to start..."))