allow disabling messages by blanking their templates

Signed-off-by: unilock <[email protected]>
unilock · May 1, 2024 · e6be6d9 · e6be6d9
1 parent ccbb00f
commit e6be6d9
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 3 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -9,7 +9,7 @@ yarn_mappings=1.20.1+build.10
 loader_version=0.15.10
 
 # Mod Properties
-mod_version=2.2.0
+mod_version=2.3.0
 maven_group=cc.unilock.nilcord
 archives_base_name=nilcord
 

diff --git a/src/main/java/cc/unilock/nilcord/EventListener.java b/src/main/java/cc/unilock/nilcord/EventListener.java
@@ -17,15 +17,19 @@ public class EventListener {
     public void serverStart() {
         try {
             NilcordPremain.discord.getJda().awaitReady();
-            NilcordPremain.discord.sendMessageToDiscord(CONFIG.formatting.discord.server_start_message.value());
+            if (!CONFIG.formatting.discord.server_start_message.value().isBlank()) {
+                NilcordPremain.discord.sendMessageToDiscord(CONFIG.formatting.discord.server_start_message.value());
+            }
         } catch (InterruptedException e) {
             LOGGER.error(e.toString());
         }
     }
 
     public void serverStop() {
         try {
-            NilcordPremain.discord.sendMessageToDiscord(CONFIG.formatting.discord.server_stop_message.value());
+            if (!CONFIG.formatting.discord.server_stop_message.value().isBlank()) {
+                NilcordPremain.discord.sendMessageToDiscord(CONFIG.formatting.discord.server_stop_message.value());
+            }
             NilcordPremain.discord.shutdown();
             NilcordPremain.discord.getJda().awaitShutdown(Duration.ofSeconds(3));
         } catch (InterruptedException e) {
@@ -34,10 +38,14 @@ public void serverStop() {
     }
 
     public void playerChatMessage(ServerPlayerEntity player, Text message) {
+        if (CONFIG.discord.webhook.enabled.value() ? CONFIG.formatting.discord.webhook.chat_message.value().isBlank() : CONFIG.formatting.discord.chat_message.value().isBlank()) return;
+
         NilcordPremain.discord.onPlayerChatMessage(player, message);
     }
 
     public void playerJoin(ServerPlayerEntity player) {
+        if (CONFIG.formatting.discord.join_message.value().isBlank()) return;
+
         String message = TextUtils.parsePlayer(
                 CONFIG.formatting.discord.join_message.value(),
                 player
@@ -46,6 +54,8 @@ public void playerJoin(ServerPlayerEntity player) {
     }
 
     public void playerLeave(ServerPlayerEntity player) {
+        if (CONFIG.formatting.discord.leave_message.value().isBlank()) return;
+
         String message = TextUtils.parsePlayer(
                 CONFIG.formatting.discord.leave_message.value(),
                 player
@@ -68,6 +78,8 @@ public void playerAdvancement(ServerPlayerEntity player, Advancement advancement
                 default -> CONFIG.formatting.discord.advancement_fallback_message.value();
             };
 
+            if (template.isBlank()) return;
+
             String message = TextUtils.parseAdvancement(
                     template,
                     player,
@@ -78,6 +90,8 @@ public void playerAdvancement(ServerPlayerEntity player, Advancement advancement
     }
 
     public void playerDeath(ServerPlayerEntity player, DamageSource source) {
+        if (CONFIG.formatting.discord.death_message.value().isBlank()) return;
+
         String message = TextUtils.parseDeath(
                 CONFIG.formatting.discord.death_message.value(),
                 player,

diff --git a/src/main/java/cc/unilock/nilcord/discord/Discord.java b/src/main/java/cc/unilock/nilcord/discord/Discord.java
@@ -70,6 +70,8 @@ public void onReady(@NotNull ReadyEvent event) {
 
     @Override
     public void onMessageReceived(@NotNull MessageReceivedEvent event) {
+        if (CONFIG.formatting.minecraft.discord_message.value().isBlank()) return;
+
         if (!event.isFromType(ChannelType.TEXT)) return;
         if (!event.getChannel().asTextChannel().getId().equals(CONFIG.discord.channel_id.value())) return;