From b69f1de11e970c5da11b0afccc333f04f6f584c3 Mon Sep 17 00:00:00 2001 From: Vankka Date: Sun, 11 Jun 2023 14:34:07 +0300 Subject: [PATCH] Clarify what "award" means and change "Webhook" -> "Bot" in webhookFormat --- .../common/config/main/channels/AwardMessageConfig.java | 2 -- .../config/main/channels/DiscordToMinecraftChatConfig.java | 2 +- .../main/channels/base/server/ServerBaseChannelConfig.java | 2 ++ 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/src/main/java/com/discordsrv/common/config/main/channels/AwardMessageConfig.java b/common/src/main/java/com/discordsrv/common/config/main/channels/AwardMessageConfig.java index 78140037..50aa9276 100644 --- a/common/src/main/java/com/discordsrv/common/config/main/channels/AwardMessageConfig.java +++ b/common/src/main/java/com/discordsrv/common/config/main/channels/AwardMessageConfig.java @@ -22,12 +22,10 @@ import com.discordsrv.api.discord.entity.message.DiscordMessageEmbed; import com.discordsrv.api.discord.entity.message.SendableDiscordMessage; import com.discordsrv.common.config.annotation.Untranslated; import org.spongepowered.configurate.objectmapping.ConfigSerializable; -import org.spongepowered.configurate.objectmapping.meta.Comment; @ConfigSerializable public class AwardMessageConfig implements IMessageConfig { - @Comment("Enable achievement/advancement message forwarding") public boolean enabled = true; @Untranslated(Untranslated.Type.VALUE) diff --git a/common/src/main/java/com/discordsrv/common/config/main/channels/DiscordToMinecraftChatConfig.java b/common/src/main/java/com/discordsrv/common/config/main/channels/DiscordToMinecraftChatConfig.java index 7db0d969..8dc7a203 100644 --- a/common/src/main/java/com/discordsrv/common/config/main/channels/DiscordToMinecraftChatConfig.java +++ b/common/src/main/java/com/discordsrv/common/config/main/channels/DiscordToMinecraftChatConfig.java @@ -38,7 +38,7 @@ public class DiscordToMinecraftChatConfig { @Comment("The Discord to Minecraft message format for webhook messages (if enabled)") @Untranslated(Untranslated.Type.VALUE) - public String webhookFormat = "[ᛩF2Discord&r] [hover:show_text:Webhook message]%user_name%&r » %message%%message_attachments%"; + public String webhookFormat = "[ᛩF2Discord&r] [hover:show_text:Bot message]%user_name%&r » %message%%message_attachments%"; @Comment("Attachment format") @Untranslated(Untranslated.Type.VALUE) diff --git a/common/src/main/java/com/discordsrv/common/config/main/channels/base/server/ServerBaseChannelConfig.java b/common/src/main/java/com/discordsrv/common/config/main/channels/base/server/ServerBaseChannelConfig.java index c24c9079..bb4c7499 100644 --- a/common/src/main/java/com/discordsrv/common/config/main/channels/base/server/ServerBaseChannelConfig.java +++ b/common/src/main/java/com/discordsrv/common/config/main/channels/base/server/ServerBaseChannelConfig.java @@ -23,6 +23,7 @@ import com.discordsrv.common.config.main.channels.AwardMessageConfig; import com.discordsrv.common.config.main.channels.DeathMessageConfig; import com.discordsrv.common.config.main.channels.base.BaseChannelConfig; import org.spongepowered.configurate.objectmapping.ConfigSerializable; +import org.spongepowered.configurate.objectmapping.meta.Comment; @ConfigSerializable public class ServerBaseChannelConfig extends BaseChannelConfig { @@ -31,6 +32,7 @@ public class ServerBaseChannelConfig extends BaseChannelConfig { public ServerJoinMessageConfig joinMessages = new ServerJoinMessageConfig(); @Order(3) + @Comment("Advancement/Achievement message configuration") public AwardMessageConfig awardMessages = new AwardMessageConfig(); @Order(3)