diff --git a/.gradle/8.1.1/checksums/checksums.lock b/.gradle/8.1.1/checksums/checksums.lock index e53aa04..e15eb22 100644 Binary files a/.gradle/8.1.1/checksums/checksums.lock and b/.gradle/8.1.1/checksums/checksums.lock differ diff --git a/.gradle/8.1.1/executionHistory/executionHistory.bin b/.gradle/8.1.1/executionHistory/executionHistory.bin index bb4e045..cea1cae 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 b6a0820..af8abf9 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 d214312..eef48cf 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 14b7782..9d7421f 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 6fb6b1f..817b306 100644 Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/.gradle/file-system.probe b/.gradle/file-system.probe index 061dd31..67525ee 100644 Binary files a/.gradle/file-system.probe and b/.gradle/file-system.probe differ 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 = "<${discord:display_name}> ${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; + } +}