From b33910a8ef5462cf6198f0c872f73601f5c6e9f8 Mon Sep 17 00:00:00 2001 From: TheClashFruit Date: Tue, 27 Jun 2023 14:55:07 +0200 Subject: [PATCH] feat: more config --- .../executionHistory/executionHistory.bin | Bin 897080 -> 1049120 bytes .../executionHistory/executionHistory.lock | Bin 17 -> 17 bytes .gradle/8.1.1/fileHashes/fileHashes.bin | Bin 22847 -> 23747 bytes .gradle/8.1.1/fileHashes/fileHashes.lock | Bin 17 -> 17 bytes .../buildOutputCleanup.lock | Bin 17 -> 17 bytes .idea/modules.xml | 1 + .../yadmb/config/MainConfigModel.java | 43 +++++++++++++++++- .../yadmb/discord/BotClient.java | 4 +- 8 files changed, 45 insertions(+), 3 deletions(-) diff --git a/.gradle/8.1.1/executionHistory/executionHistory.bin b/.gradle/8.1.1/executionHistory/executionHistory.bin index d460802b38e5ecbf0796e74bae887e7eade3c029..bb4e0457bde6de4581d6adbd67d302b257fe73e7 100644 GIT binary patch delta 4467 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 delta 466 zcmZ3`;;`d^*#r?ru8E@6jJ+E-W{6KbpfFidqL7)Vduns9M0>9UBM>tIF*6Xe05K~N zvjH(X5OV-AClGT1G57Xf2_BJRl}WQrQcIFjGSbX)@>26ka?(tz5=%2vE7LP8QW?O2 zDQf$|3#?om?dK=+Y(GDlcdFp@KMI@^gj^nNvaQ-VO*VU{BFkl!J+h4JrU%Ayi*G-0 ziqC~<`}<}d4yNfm=lQ|})|#xDoNoF2mcXRRFIQ|x%$5?(9QmfynrhdSJHckJRle1Q&p;u= z9h08)TUKoSk@z+F=7rg%K%t9_KXXnidbx#dJ?L=3YQ`?0&_e0(B?^*ne>1$)+i<9& b*JgWvCl3oF%hmZnOV+7z-k&bHfma>?dN{>I diff --git a/.gradle/8.1.1/executionHistory/executionHistory.lock b/.gradle/8.1.1/executionHistory/executionHistory.lock index 4c4eb7c33c9127defe2d8e86a56010a344de5d99..b6a08204e738a65b3a40a33dc8640845f2bf76f4 100644 GIT binary patch literal 17 UcmZRs{V?TCkXyGQ0|e{_066po00000 literal 17 UcmZRs{V?TCkXyGQ0|cxG066Fb^Z)<= diff --git a/.gradle/8.1.1/fileHashes/fileHashes.bin b/.gradle/8.1.1/fileHashes/fileHashes.bin index 68f12f857af2d72824a03fd920be769e2d48e808..d2143129b6838b19cdad2bca0b7a0be17d6705fb 100644 GIT binary patch delta 1771 zcmZwIdoWyA7y$6S>xyT&VVl}z?JiQGp0z~Ol1eEWsYljZh>SsyQjI8@C4V3h@i;iV0?jYUm zNE2JnEIwPTF_@Sfnnse1fY;k_Tz0wXW0(ZRw2-Z5CTVI^yo=il;EkO)5 z4(nU6zIaCxSj| zJ4Pgi*$I+p5(Gn3&dxi`R7IHDk$$ej znU{Ll=O~ShdXHU5BqaaMU-NzhLbnC+UiGTX+NXJf!PbFqkkp)*%rVWgvMh<{A(5pz z2kiV!l_a8B5aCZ_im7#yE2*}<6GNbl9+t5-4}3r!i-lMAr!3X!D4$7d@${APw3da4SXI0b%6k%#lSV_Jag$nNzf-n7A!LL&I*TH{gq757<`ONe4q!xR8R<> zd=DH7w#MgYAR(B>e5%pKcA@?}Y}&#}Ur4V|hb3nSr2YrE5iH%#=U^!KBu^rGLc}#s z;IrJr*EHPME9KoPdVWy2`m9LF60X!w2r|C+@UCoGJectlO(@aWt2&7L~t?jd^I&Ou5S&+Ac-e4WKTtscC;!=_*>+Nm~m8C#t)qQkI015hN6gPKPY|F zTA_OpEm*1J41`0mBm*SGLs6VxBMBR16hu)Vx*k&u+2zz z#(&}P*H$80CW;`^gDZDZR*#*b`%HIS=(6n@Bx6MeP%J{BrYJTS=WLP#c(tr+BC(Mc zDHdN`R^%l?RE!k~+q^e?j#Izai@hiq=6CKKu6aVB4vOMB!?@HwW1siiEy~8N^u`oe z1Ao({Ly02&{^dH^$~v=jvTt5(F^OB2XB4ZlyAw17cXA@(r+>CeG&(nqXK8D_Tgms^ j-G~}lQDjc3+svMBp7r6;_WPX9-TWMqoeh@$QCR&8)gc^3 delta 532 zcmX@SlX3qh#tkMCg5eDhxXd%B-BcPu6|1tenJTUpbG-Yvn2?+saE!Zk11%{8xU(0CIyVC&cNR;TkKCzDSxFfexfId>uhVlB(x&6%F7I25+- z@!4t_siKN}Fil_vLstf!ORUGz{jf2#g&s|WN92+F1P%V4>Y)0wreB*}QUpX4e z*`SIWz>1k(g>9Z5WXGtGG;vGa#S1e-*$y*aC`#yR2dgU5%ZC`r$T<0H@QR>A_dRZR zKH1w{%zmM`J4JLF)F?HGBCa$bt!E4*G=W$Vgay{SH2f~Uls?UgO`B)U^Rs`UI(UJS zK)~cRnK4LM{?5rsGX<}(J$k#L)S_Wy9z@Ogs}MD8l9LrfyMew@pS(WwJCGKhyfSPu zkd~WlA6}<0XU)t+O>tvg-CIp}&6=Ow1#8}RVlhNB%hbtt!y|!;xhGpj=mTl_$=MN7 z3fCT&rDS?0M0`FKJe$>cTOZU_N)S!lhLe{@fWl9C^7)8F{&N>(A>ur7Kw1v~h4FEcY1n>X= 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..."))