From 829235ce1b9c7c7b8f494b7a61537901cd55ba98 Mon Sep 17 00:00:00 2001
From: TheClashFruit <clash.fruit123@gmail.com>
Date: Tue, 27 Jun 2023 17:56:35 +0200
Subject: [PATCH] feat: config

---
 .gradle/8.1.1/checksums/checksums.lock        | Bin 17 -> 17 bytes
 .../executionHistory/executionHistory.bin     | Bin 1049120 -> 1125854 bytes
 .../executionHistory/executionHistory.lock    | Bin 17 -> 17 bytes
 .gradle/8.1.1/fileHashes/fileHashes.bin       | Bin 23747 -> 24047 bytes
 .gradle/8.1.1/fileHashes/fileHashes.lock      | Bin 17 -> 17 bytes
 .../buildOutputCleanup.lock                   | Bin 17 -> 17 bytes
 .gradle/file-system.probe                     | Bin 8 -> 8 bytes
 build.gradle                                  |   2 +-
 gradle.properties                             |   1 +
 .../java/me/theclashfruit/yadmb/YADMB.java    |   4 +++
 .../yadmb/config/MainConfigModel.java         |  24 ++++++------------
 .../yadmb/util/DiscordMessageParser.java      |   9 +++++++
 12 files changed, 23 insertions(+), 17 deletions(-)
 create mode 100644 src/main/java/me/theclashfruit/yadmb/util/DiscordMessageParser.java

diff --git a/.gradle/8.1.1/checksums/checksums.lock b/.gradle/8.1.1/checksums/checksums.lock
index e53aa04f0afd991145326de574720123e51c1392..e15eb2223e9f4044aca1e87ba596878259167b49 100644
GIT binary patch
literal 17
VcmZR+CI0N<|7pjjGk^ipYyd`n20H)%

literal 17
VcmZR+CI0N<|7pjjGk^ipbO1(r1~&iz

diff --git a/.gradle/8.1.1/executionHistory/executionHistory.bin b/.gradle/8.1.1/executionHistory/executionHistory.bin
index bb4e0457bde6de4581d6adbd67d302b257fe73e7..cea1cae4ba171867c4db5adcbb9626b457b94c21 100644
GIT binary patch
delta 1253
zcmZ3`;&AV_%LEZd-ie}<c^Me^ZoFV%)U;q=VA!~EV~Y4>Nr^&c0Vaj!UWx6!5{#CN
zN~NiV>8WO=X{K3;#zi^VNhRrdDLF;uc?G#ZJs=P=-A0NrxZPTc5r~<9m>Gy!fS47C
z*?^cGh&h0m6NtHhm>Y<BfS4DE`L<h2@jrcTV9da%y%mVpg7EC}w5qJ~!iuE)tfZon
z+!WKy%%tobqYR_UQizpIhqo`hz{<tZett5~_Vbf@HwiHEO<%Zz*JS!TCJy%P0-yNH
z7#S~5Z+ymPt&^Oeo12)I662AYQ{W6?>t!XDB{B<q_g>ZMbtbj2`CfXl>72wRj60?W
z#&U~KKX8hVLlUY@A6*-osXm!`*{G&|S^4&TLan>*+;?7Q{EId!V>K0B+f}ez^<Zud
z&C9_scX22CEQ#8#i7_Ai`44r-nlSD{xK<SAS`>}jFP`FaW){fFoO>(viCLsr@rT~}
zLY+_B8&~q$F$!E;<-4Ez{O1*=Ct4R}<W6&#ets42G?uPU*Pl<<OXgOXu5*D;pLz4A
z>(k>d@EJ010WzF^@*6R)12T?Z;4=b?tog|w2ojn0i{FEJJy6E`7r!<01|XyJ7r!l-
zaq<_xG4n>C$p2sbmdu-g4C~)OH6TXiZ+=6t4Qqe%O9@GvY_xGV4yYDgas9}X#Eh*#
z1vh{5n=$tQ8GBaq`b>}e!!N+x3*;64;Sc5lGM@Jv-sNCiKi%OnpT_hBYj`D?`+%~7
zfB8L``+<zuzx?K4hT~dZJ?RNx^-H*!83dSDcD!(Y@?b&o+KDbpJ}mh;ed9(JndyK2
z@(a{Y0;_r{$j|`|QN~Hg2_QKqvACE)AZojW^S#=G5;EOMU4QOO>75MLb%BX-5^}sk
z6$i4&Co)Zas(dK*^t{_Uv^b`~6i-2kEIp8NJ)q&e&fQ#d6Zi1Q6kq$@HAmprRIvJM
zOhAWU)7bIcKWhGTzk8KsrmEIkrr){3XUx0^=vS|Q{5s5wfegp1e9{80YJMVpDhe#O
z?H8-pT<`fhJs^eKfO!c}dj3^DZRX`b#@VZUy38wpjK5d;)FoO^UrH!YJN>V5=FBNi
zYeGF&g6*8eIZc&Qm3bRb)tvwQS|PK*qMsFkE~)?eJ$k#W(~|9OuG7V?emM&iTL0tq
zYm18~K3wbl^D1xG?a4r)E2s9YUKyWP`bsZ<%jLN{4giJR*L6IN{wD2lblba|=0aaQ
zruTR9e9=}+dcDk4sA$nu=jRK3wlUs1@evfc%XNSnjs_ljc*r_wWypn4{=1+5-<{5Q
mgYSg=%s+d+#%}Q|T_V6PvQ$Um)uhiL4fF4DvoHb+kX-=i;US{{

delta 141
zcmcb2+hswE!vqmVo{6H98JBK67$H9Kg2ZG=i9%++8!wuBCARlUFj_Jyr4?jnmRFVJ
zm#1ZvnJ1YPC6;CwXPG7C7^gBofWdSdDaPP-Ybiz`W&&bnAZ7t#Rv=~rVs;?r0Afxc
W<^p1FAm#yLULfY%ZY{<C^f>_NeJSez

diff --git a/.gradle/8.1.1/executionHistory/executionHistory.lock b/.gradle/8.1.1/executionHistory/executionHistory.lock
index b6a08204e738a65b3a40a33dc8640845f2bf76f4..af8abf9c9d46bb1786226c4bdf9d7153aa94a8de 100644
GIT binary patch
literal 17
UcmZRs{V?TCkXyGQ0|Xod066*u1^@s6

literal 17
UcmZRs{V?TCkXyGQ0|e{_066po00000

diff --git a/.gradle/8.1.1/fileHashes/fileHashes.bin b/.gradle/8.1.1/fileHashes/fileHashes.bin
index d2143129b6838b19cdad2bca0b7a0be17d6705fb..eef48cf5922c4d64477ab86becab28dbf24d612e 100644
GIT binary patch
delta 900
zcmX@Slkxp-#tkMCjQN{QB^EFVoHsR)Thp+nlmQH4)hC~o3J|z?v6ru-za$(Y7;|{D
zsPqd)0p<wp$i@TJFr|^3zsjs&60oRw@V}3B#Zsu+ual?BTL{?B*L$E8nkE1>wR`hX
zc@0K^l$)Z9d|q$82Nm7B`Kf{tBNJEUM#UfE8x0olZg%vrVpQ<l{jcjt!0IM%ODPuC
zM{_PRFfexf`Eu|LL>JSe&9gmwIheox6q>9ZBo)+p`cguH+Ub9dGiOeDS`+FCR{iy-
zCPX#MEFi6C3?x7TiXbd7^Ut2Iv0MB~mk6+nEY(qX1=TSLD9OOU^j?1R^dNR7acPr{
zHtxm&)uJn|A9<3P0aau=d25Ki>DQl7kFhQRYC$tzG3oU(Q=y_oSDl|P^x4LE3!?MK
ziOG_olYy=_o4h{sJCK%|yfO^LSDtJi4&rl7wv5mR(khd)!L<71xnNpj^7)8Fpt#ax
z<4BM^&*W4v%{zHIls*Zj`6mAc)BKZlqd@BTC&z<n<H-}jw8`YdU|MhTS14aS8l=u>
zawL@Q2GjbJ_kwAI$?u`GVhl)~;pAX2tv9(fM!){+Pf(Zw0pl_tfffR5LdtR&x814u
za&U_|o3?chI0QaUSP#~~zz~F~<Jt~4#!Jk(vTZt-Kgj!XPXO!qBrc0fN4=uJ7sb4d
z6-HO?Id%!1?&b`<57lB1)e?efNz`@;=X<pWC1kpjy8hgm(hJt{^`|gI2V(%HjzAXq
zM5d`vl@Fz!o_BkP76(*^2!kzH4>m2m&fQ#d6Zi1Q6kq$@HAmnVREsFok}!}Z0LxJ;
AW&i*H

delta 496
zcmaFAoAK~Y#tkMCjG3EFB^EGEek<j%*;o1j<7QV`An&id!Dd$l1;)*_idu|JoG&*j
z{t(}2V8FN8(Zh;S;lqMQd6#sj-28qhOZ#{FtN#oPj2++eoPIHY0h8F~*`B=|%r8z}
zoU9!r6}0QbS)tYbx!f=F(pl>RPaXlO{`2DGQ;2Hj9Y9*o7)WRWu_6cyJdj-ZqOaKS
z=r8$WPF3q>hCp<j@&ZaSFfhHd+B`jook`p`-s{tZseM(q_o>S-y7Lxl?8nJlL-b8w
zoID3s%)q(?NTV75p>4swvh#YEJ}my6a9sCVKU8PeWXaIUKv#d7ygu|hkiIr~Wf+M6
zV6uHUh<|*tWrRMEemFTBOh2AH7fe5yd_E!(D1L9UaU@9o)Z|nsJsnJ+o_rEapPBp{
zOrM>s8wFB#c5*zJem{94ls*imUrqiB<*P@7)P0y738vpo?grDZC+`K*ZzjJ7({Cp$
c#(>nln;Z<LUr%n0(dP&1gM<L%GEfKr0Fp`ADgXcg

diff --git a/.gradle/8.1.1/fileHashes/fileHashes.lock b/.gradle/8.1.1/fileHashes/fileHashes.lock
index 14b77820fe5db3b2be4ab03b69b26dacb4a76060..9d7421fb2d25f773ee1ff6fddb297ad3ef847a99 100644
GIT binary patch
literal 17
VcmZQx^mg0F-gy^t7{Gw}A^=FC26X@c

literal 17
VcmZQx^mg0F-gy^t7{Gve0RTvF21Eb=

diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index 6fb6b1fb3f83278acff45fa117fcd57916e01427..817b306694aea95f8f0676852494ef0d310893d7 100644
GIT binary patch
literal 17
VcmZRc<x;Tm*ng*83}C?M0RTFp1q}cI

literal 17
VcmZRc<x;Tm*ng*83}C?M1OPgm1qT2C

diff --git a/.gradle/file-system.probe b/.gradle/file-system.probe
index 061dd31037186585d109ede46f6c89e057d604fc..67525ee07ee53182ebe3c2488ed091eaeb5cc383 100644
GIT binary patch
literal 8
PcmZQzVC?vtlC%u~2~YzA

literal 8
PcmZQzVC?u4<X;K^2(JR1

diff --git a/build.gradle b/build.gradle
index 31bbefa..a3f64f4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -35,7 +35,7 @@ dependencies {
     modImplementation "io.wispforest:owo-lib:${project.owo_version}"
 
     // placeholders
-    modImplementation include("eu.pb4:placeholder-api:2.1.0+1.19.4")
+    modImplementation include("eu.pb4:placeholder-api:${project.papi_version}")
 
     // config yay
     annotationProcessor "io.wispforest:owo-lib:${project.owo_version}"
diff --git a/gradle.properties b/gradle.properties
index f184a8d..815c8ef 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -17,3 +17,4 @@ archives_base_name = yadmb
 fabric_version=0.84.0+1.19.4
 owo_version=0.10.4+1.19.4
 jda_version=5.0.0-beta.11
+papi_version=2.1.0+1.19.4
\ No newline at end of file
diff --git a/src/main/java/me/theclashfruit/yadmb/YADMB.java b/src/main/java/me/theclashfruit/yadmb/YADMB.java
index 7e11f35..d0ba424 100644
--- a/src/main/java/me/theclashfruit/yadmb/YADMB.java
+++ b/src/main/java/me/theclashfruit/yadmb/YADMB.java
@@ -13,5 +13,9 @@ public class YADMB implements ModInitializer {
     @Override
     public void onInitialize() {
         LOGGER.info("Oh wow, it started, anyways I'm just here to litter your logs.");
+
+        if(CONFIG.schemaVersion() != 1) {
+            LOGGER.error("Unknown schema version! Please fix the config file at config/yadmb.json5. Server could crash while starting this mod!");
+        }
     }
 }
diff --git a/src/main/java/me/theclashfruit/yadmb/config/MainConfigModel.java b/src/main/java/me/theclashfruit/yadmb/config/MainConfigModel.java
index 38f8677..8fbfbfa 100644
--- a/src/main/java/me/theclashfruit/yadmb/config/MainConfigModel.java
+++ b/src/main/java/me/theclashfruit/yadmb/config/MainConfigModel.java
@@ -13,18 +13,13 @@ public class MainConfigModel {
         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 Messages messages = new Messages();
 
-        public static class MessagesDiscord {
+        public static class Messages {
             @Nest
-            public ChatMessage chatMessage = new ChatMessage();
+            public ChatMessage chat = new ChatMessage();
 
             public static class ChatMessage {
                 public String content = "${message}";
@@ -34,17 +29,14 @@ public class MainConfigModel {
 
                 public static class Webhook {
                     public Boolean enabled = true;
-                    public String username = "${username}";
-                    public String avatarUrl = "https://crafatar.com/avatars/${uuid}";
+                    public String username = "${player:username}";
+                    public String avatar = "https://crafatar.com/avatars/${player:uuid}";
                 }
             }
         }
+    }
 
-        @Nest
-        public MessagesMinecraft minecraft = new MessagesMinecraft();
-
-        public static class MessagesMinecraft {
-
-        }
+    public static class Minecraft {
+        public String format = "<<color:${discord:role_colour}>${discord:display_name}<reset>> ${discord:message}";
     }
 }
diff --git a/src/main/java/me/theclashfruit/yadmb/util/DiscordMessageParser.java b/src/main/java/me/theclashfruit/yadmb/util/DiscordMessageParser.java
new file mode 100644
index 0000000..4ea6cb1
--- /dev/null
+++ b/src/main/java/me/theclashfruit/yadmb/util/DiscordMessageParser.java
@@ -0,0 +1,9 @@
+package me.theclashfruit.yadmb.util;
+
+public class DiscordMessageParser {
+    public static String parse(String message) {
+        // nah
+
+        return message;
+    }
+}