From 74175d7f57ffcff0e96ca38b19fb43112c820ebb Mon Sep 17 00:00:00 2001 From: ErdbeerbaerLP Date: Tue, 7 Nov 2023 11:41:30 +0100 Subject: [PATCH] Update to 3.0.4, Fix advanced channel ids Signed-off-by: ErdbeerbaerLP --- build.gradle | 4 +- gradle.properties | 2 +- .../forge/DiscordIntegrationMod.java | 46 ++-- translations/English.toml | 222 ------------------ translations/German.toml | 222 ------------------ translations/README.md | 3 - 6 files changed, 26 insertions(+), 473 deletions(-) delete mode 100644 translations/English.toml delete mode 100644 translations/German.toml delete mode 100644 translations/README.md diff --git a/build.gradle b/build.gradle index 5d05230d..ddd98f5b 100644 --- a/build.gradle +++ b/build.gradle @@ -30,7 +30,7 @@ apply plugin: 'org.spongepowered.mixin' //Build variables -version = "3.0.3" +version = "3.0.4-SNAPSHOT" group = "de.erdbeerbaerlp.dcintegration" archivesBaseName = "dcintegration-forge" @@ -94,7 +94,7 @@ configurations.all { //Dependencies dependencies { // ========= Common ===================== - embed('de.erdbeerbaerlp:dcintegration.common:3.0.3') { + embed('de.erdbeerbaerlp:dcintegration.common:3.0.4') { changing = true } diff --git a/gradle.properties b/gradle.properties index 98c283cf..66d0b72b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,6 +2,6 @@ # This is required to provide enough memory for the Minecraft decompilation process. org.gradle.jvmargs=-Xmx3G org.gradle.daemon=false -changelog=Large discord integration rewrite adding new features and fixing long existing bugs\nOld configuration can be used as-is\n\nAdded custom status\nAdded tellraw\nAdded option to disable chat message editing for compatibility reasons\nFixed lots of bugs +changelog=General system stability improvements to enhance the user's experience. (Bug fixes) releaseType = BETA mcVersion = 1.18.2 \ No newline at end of file diff --git a/src/main/java/de/erdbeerbaerlp/dcintegration/forge/DiscordIntegrationMod.java b/src/main/java/de/erdbeerbaerlp/dcintegration/forge/DiscordIntegrationMod.java index c7c7c40f..1dc1f1e0 100644 --- a/src/main/java/de/erdbeerbaerlp/dcintegration/forge/DiscordIntegrationMod.java +++ b/src/main/java/de/erdbeerbaerlp/dcintegration/forge/DiscordIntegrationMod.java @@ -151,15 +151,15 @@ public void playerJoin(final PlayerEvent.PlayerLoggedInEvent ev) { .replace("%avatarURL%", avatarURL) .replace("%playerColor%", "" + TextColors.generateFromUUID(p.getUUID()).getRGB()) ); - DiscordIntegration.INSTANCE.sendMessage(new DiscordMessage(b.build())); + DiscordIntegration.INSTANCE.sendMessage(new DiscordMessage(b.build()),INSTANCE.getChannel(Configuration.instance().advanced.serverChannelID)); } else { final EmbedBuilder b = Configuration.instance().embedMode.playerJoinMessage.toEmbed(); b.setAuthor(ForgeMessageUtils.formatPlayerName(p), null, avatarURL) .setDescription(Localization.instance().playerJoin.replace("%player%", ForgeMessageUtils.formatPlayerName(p))); - DiscordIntegration.INSTANCE.sendMessage(new DiscordMessage(b.build())); + DiscordIntegration.INSTANCE.sendMessage(new DiscordMessage(b.build()),INSTANCE.getChannel(Configuration.instance().advanced.serverChannelID)); } } else - DiscordIntegration.INSTANCE.sendMessage(Localization.instance().playerJoin.replace("%player%", ForgeMessageUtils.formatPlayerName(p))); + DiscordIntegration.INSTANCE.sendMessage(Localization.instance().playerJoin.replace("%player%", ForgeMessageUtils.formatPlayerName(p)),INSTANCE.getChannel(Configuration.instance().advanced.serverChannelID)); } // Fix link status (if user does not have role, give the role to the user, or vice versa) WorkThread.executeJob(() -> { @@ -199,7 +199,7 @@ public void advancement(AdvancementEvent ev) { .replace("%avatarURL%", avatarURL) .replace("%playerColor%", "" + TextColors.generateFromUUID(ev.getEntity().getUUID()).getRGB()) ); - INSTANCE.sendMessage(new DiscordMessage(b.build())); + INSTANCE.sendMessage(new DiscordMessage(b.build()),INSTANCE.getChannel(Configuration.instance().advanced.serverChannelID)); } else { EmbedBuilder b = Configuration.instance().embedMode.advancementMessage.toEmbed(); b = b.setAuthor(ForgeMessageUtils.formatPlayerName(ev.getEntity()), null, avatarURL) @@ -214,7 +214,7 @@ public void advancement(AdvancementEvent ev) { .getDescription() .getString())) .replace("\\n", "\n")); - INSTANCE.sendMessage(new DiscordMessage(b.build())); + INSTANCE.sendMessage(new DiscordMessage(b.build()),INSTANCE.getChannel(Configuration.instance().advanced.serverChannelID)); } } else INSTANCE.sendMessage(Localization.instance().advancementMessage.replace("%player%", ChatFormatting.stripFormatting(ForgeMessageUtils.formatPlayerName(ev.getEntity()))) @@ -228,7 +228,7 @@ public void advancement(AdvancementEvent ev) { .getDisplay() .getDescription() .getString())) - .replace("\\n", "\n")); + .replace("\\n", "\n"),INSTANCE.getChannel(Configuration.instance().advanced.serverChannelID)); } } @@ -255,11 +255,11 @@ public void serverStarted(final ServerStartedEvent ev) { if (Configuration.instance().embedMode.enabled && Configuration.instance().embedMode.startMessages.asEmbed) { if (!Configuration.instance().embedMode.startMessages.customJSON.isBlank()) { final EmbedBuilder b = Configuration.instance().embedMode.startMessages.toEmbedJson(Configuration.instance().embedMode.startMessages.customJSON); - DiscordIntegration.INSTANCE.sendMessage(new DiscordMessage(b.build())); + DiscordIntegration.INSTANCE.sendMessage(new DiscordMessage(b.build()),INSTANCE.getChannel(Configuration.instance().advanced.serverChannelID)); } else - DiscordIntegration.INSTANCE.sendMessage(new DiscordMessage(Configuration.instance().embedMode.startMessages.toEmbed().setDescription(Localization.instance().serverStarted).build())); + DiscordIntegration.INSTANCE.sendMessage(new DiscordMessage(Configuration.instance().embedMode.startMessages.toEmbed().setDescription(Localization.instance().serverStarted).build()),INSTANCE.getChannel(Configuration.instance().advanced.serverChannelID)); } else - DiscordIntegration.INSTANCE.sendMessage(Localization.instance().serverStarted); + DiscordIntegration.INSTANCE.sendMessage(Localization.instance().serverStarted,INSTANCE.getChannel(Configuration.instance().advanced.serverChannelID)); } INSTANCE.startThreads(); } @@ -401,20 +401,20 @@ public void serverStopping(ServerStoppedEvent ev) { if (Configuration.instance().embedMode.enabled && Configuration.instance().embedMode.stopMessages.asEmbed) { if (!Configuration.instance().embedMode.stopMessages.customJSON.isBlank()) { final EmbedBuilder b = Configuration.instance().embedMode.stopMessages.toEmbedJson(Configuration.instance().embedMode.stopMessages.customJSON); - DiscordIntegration.INSTANCE.sendMessage(new DiscordMessage(b.build())); + DiscordIntegration.INSTANCE.sendMessage(new DiscordMessage(b.build()),INSTANCE.getChannel(Configuration.instance().advanced.serverChannelID)); } else - DiscordIntegration.INSTANCE.sendMessage(new DiscordMessage(Configuration.instance().embedMode.stopMessages.toEmbed().setDescription(Localization.instance().serverStopped).build())); + DiscordIntegration.INSTANCE.sendMessage(new DiscordMessage(Configuration.instance().embedMode.stopMessages.toEmbed().setDescription(Localization.instance().serverStopped).build()),INSTANCE.getChannel(Configuration.instance().advanced.serverChannelID)); } else - DiscordIntegration.INSTANCE.sendMessage(Localization.instance().serverStopped); + DiscordIntegration.INSTANCE.sendMessage(Localization.instance().serverStopped,INSTANCE.getChannel(Configuration.instance().advanced.serverChannelID)); else if (ev.getServer().isRunning() && !Localization.instance().serverCrash.isBlank()) { if (Configuration.instance().embedMode.enabled && Configuration.instance().embedMode.stopMessages.asEmbed) { if (!Configuration.instance().embedMode.stopMessages.customJSON.isBlank()) { final EmbedBuilder b = Configuration.instance().embedMode.stopMessages.toEmbedJson(Configuration.instance().embedMode.stopMessages.customJSON); - DiscordIntegration.INSTANCE.sendMessage(new DiscordMessage(b.build())); + DiscordIntegration.INSTANCE.sendMessage(new DiscordMessage(b.build()),INSTANCE.getChannel(Configuration.instance().advanced.serverChannelID)); } else - DiscordIntegration.INSTANCE.sendMessage(new DiscordMessage(Configuration.instance().embedMode.stopMessages.toEmbed().setDescription(Localization.instance().serverStopped).build())); + DiscordIntegration.INSTANCE.sendMessage(new DiscordMessage(Configuration.instance().embedMode.stopMessages.toEmbed().setDescription(Localization.instance().serverStopped).build()),INSTANCE.getChannel(Configuration.instance().advanced.serverChannelID)); } else - DiscordIntegration.INSTANCE.sendMessage(Localization.instance().serverCrash); + DiscordIntegration.INSTANCE.sendMessage(Localization.instance().serverCrash,INSTANCE.getChannel(Configuration.instance().advanced.serverChannelID)); } INSTANCE.kill(false); INSTANCE = null; @@ -455,14 +455,14 @@ public void chat(ServerChatEvent ev) { .replace("%msg%", text) .replace("%playerColor%", "" + TextColors.generateFromUUID(ev.getPlayer().getUUID()).getRGB()) ); - INSTANCE.sendMessage(new DiscordMessage(b.build())); + INSTANCE.sendMessage(new DiscordMessage(b.build()),channel); } else { EmbedBuilder b = Configuration.instance().embedMode.chatMessages.toEmbed(); if (Configuration.instance().embedMode.chatMessages.generateUniqueColors) b = b.setColor(TextColors.generateFromUUID(ev.getPlayer().getUUID())); b = b.setAuthor(ForgeMessageUtils.formatPlayerName(ev.getPlayer()), null, avatarURL) .setDescription(text); - INSTANCE.sendMessage(new DiscordMessage(b.build())); + INSTANCE.sendMessage(new DiscordMessage(b.build()),channel); } } else INSTANCE.sendMessage(ForgeMessageUtils.formatPlayerName(ev.getPlayer()), ev.getPlayer().getUUID().toString(), new DiscordMessage(embed, text, true), channel); @@ -487,8 +487,8 @@ public void death(LivingDeathEvent ev) { final MessageEmbed embed = ForgeMessageUtils.genItemStackEmbedIfAvailable(deathMessage); if (Configuration.instance().embedMode.enabled && Configuration.instance().embedMode.deathMessage.asEmbed) { final String avatarURL = Configuration.instance().webhook.playerAvatarURL.replace("%uuid%", ev.getEntity().getUUID().toString()).replace("%uuid_dashless%", ev.getEntity().getUUID().toString().replace("-", "")).replace("%name%", ev.getEntity().getName().getString()).replace("%randomUUID%", UUID.randomUUID().toString()); - if (!Configuration.instance().embedMode.playerJoinMessage.customJSON.isBlank()) { - final EmbedBuilder b = Configuration.instance().embedMode.playerJoinMessage.toEmbedJson(Configuration.instance().embedMode.playerJoinMessage.customJSON + if (!Configuration.instance().embedMode.deathMessage.customJSON.isBlank()) { + final EmbedBuilder b = Configuration.instance().embedMode.deathMessage.toEmbedJson(Configuration.instance().embedMode.deathMessage.customJSON .replace("%uuid%", ev.getEntity().getUUID().toString()) .replace("%uuid_dashless%", ev.getEntity().getUUID().toString().replace("-", "")) .replace("%name%", ForgeMessageUtils.formatPlayerName(ev.getEntity())) @@ -501,7 +501,7 @@ public void death(LivingDeathEvent ev) { b.addBlankField(false); b.addField(embed.getTitle() + " *(" + embed.getFooter().getText() + ")*", embed.getDescription(), false); } - INSTANCE.sendMessage(new DiscordMessage(b.build())); + INSTANCE.sendMessage(new DiscordMessage(b.build()),INSTANCE.getChannel(Configuration.instance().advanced.deathsChannelID)); } else { final EmbedBuilder b = Configuration.instance().embedMode.deathMessage.toEmbed(); b.setDescription(":skull: " + Localization.instance().playerDeath.replace("%player%", ForgeMessageUtils.formatPlayerName(ev.getEntity())).replace("%msg%", ChatFormatting.stripFormatting(deathMessage.getString()).replace(ForgeMessageUtils.formatPlayerName(ev.getEntity()) + " ", ""))); @@ -540,7 +540,7 @@ public void playerLeave(PlayerEvent.PlayerLoggedOutEvent ev) { EmbedBuilder b = Configuration.instance().embedMode.playerLeaveMessages.toEmbed(); b = b.setAuthor(ForgeMessageUtils.formatPlayerName(player), null, avatarURL) .setDescription(Localization.instance().playerLeave.replace("%player%", ForgeMessageUtils.formatPlayerName(player))); - DiscordIntegration.INSTANCE.sendMessage(new DiscordMessage(b.build())); + DiscordIntegration.INSTANCE.sendMessage(new DiscordMessage(b.build()),INSTANCE.getChannel(Configuration.instance().advanced.serverChannelID)); } } else DiscordIntegration.INSTANCE.sendMessage(Localization.instance().playerLeave.replace("%player%", ForgeMessageUtils.formatPlayerName(player))); @@ -551,9 +551,9 @@ public void playerLeave(PlayerEvent.PlayerLoggedOutEvent ev) { EmbedBuilder b = Configuration.instance().embedMode.playerLeaveMessages.toEmbed(); b = b.setAuthor(ForgeMessageUtils.formatPlayerName(player), null, avatarURL) .setDescription(Localization.instance().playerTimeout.replace("%player%", ForgeMessageUtils.formatPlayerName(player))); - DiscordIntegration.INSTANCE.sendMessage(new DiscordMessage(b.build())); + DiscordIntegration.INSTANCE.sendMessage(new DiscordMessage(b.build()),INSTANCE.getChannel(Configuration.instance().advanced.serverChannelID)); } else - DiscordIntegration.INSTANCE.sendMessage(Localization.instance().playerTimeout.replace("%player%", ForgeMessageUtils.formatPlayerName(player))); + DiscordIntegration.INSTANCE.sendMessage(Localization.instance().playerTimeout.replace("%player%", ForgeMessageUtils.formatPlayerName(player)),INSTANCE.getChannel(Configuration.instance().advanced.serverChannelID)); } DiscordIntegrationMod.timeouts.remove(player.getUUID()); } diff --git a/translations/English.toml b/translations/English.toml deleted file mode 100644 index 95b572a9..00000000 --- a/translations/English.toml +++ /dev/null @@ -1,222 +0,0 @@ -[localization] -# This is what will be displayed ingame when someone types into the bot's channel -# PLACEHOLDERS: -# %user% - The username -# %id% - The user ID -# %msg% - The message -ingame_discordMessage = "§6[§5DISCORD§6]§r <%user%> %msg%" -# This is what will be displayed ingame when someone sends an reply into the bot's channel -# PLACEHOLDERS: -# %user% - The username -# %id% - The user ID -# %msg% - The reply message -# %ruser% - The username of the message that got the reply -# %rmsg% - The replied message -ingame_discordReplyMessage = "§6[§5DISCORD§6]§r §a%user%§r in reply to §3%ruser%§r: %msg%" -# Message shown when hovering over the username of an discord message -# PLACEHOLDERS: -# %user% - The username/nickname (Someone123) -# %user#tag% - The username with tag (someone#0001) -# %id% - The user ID -# -# NOTE: using an @ here can cause ping sounds ingame -discordUserHover = "§3Discord User %user#tag%\n§aClick to mention" -# This message will edited in / sent when the server finished starting -serverStarted = "Server Started!" -# Message to show while the server is starting -# This will be edited to SERVER_STARTED_MSG when webhook is false -serverStarting = "Server Starting..." -# This message will be sent when the server was stopped -serverStopped = "Server Stopped!" -# The message to print to discord when it was possible to detect a server crash -serverCrash = "Server Crash Detected :thinking:" -# Gets sent when an player joins -# -# PLACEHOLDERS: -# %player% - The player's name -playerJoin = "%player% joined" -# Gets sent when an player leaves -# -# PLACEHOLDERS: -# %player% - The player's name -playerLeave = "%player% left" -# Gets sent when an player dies -# -# PLACEHOLDERS: -# %player% - The player's name -# %msg% - The death message -playerDeath = "%player% %msg%" -# Message sent instead of playerLeave, when the player times out -# -# PLACEHOLDERS: -# %player% - The player's name -playerTimeout = "%player% timed out!" -# Gets sent when an player finishes an advancement -# Supports MulitLined messages using \n -# -# PLACEHOLDERS: -# %player% - The player's name -# %name% - The advancement name -# %desc% - The advancement description -advancementMessage = "%player% just made the advancement **%name%**\n_%desc%_" -# The chat message in discord, sent from an player in-game -# -# PLACEHOLDERS: -# %player% - The player's name -# %msg% - The chat message -discordChatMessage = "%player%: %msg%" -# Sent to a player when someone reacts to his messages -# PLACEHOLDERS: -# %name% - (Nick-)Name of the user who reacted (format: 'SomeNickName') -# %name2% - Name of the user who reacted with discord discriminator (format: 'SomeName#0123') -# %msg% - Content of the message which got the reaction -# %emote% - The reacted emote -reactionMessage = "§6[§5DISCORD§6]§r§7 %name% reacted to your message \"§9%msg%§7\" with '%emote%'" - -# Strings about the discord commands -[localization.commands] -# Shown in console when trying to use the discord command -ingameOnly = "This command can only be executed ingame" -# Shown when successfully reloading the config file -configReloaded = "Config reloaded!" -# Shown when an subcommand is disabled -subcommandDisabled = "This subcommand is disabled!" -# Message sent when user does not have permission to run a command -noPermission = "You don't have permission to execute this command!" -# Message sent when an invalid command was typed -# -# PLACEHOLDERS: -# %prefix% - Command prefix -unknownCommand = "Unknown command, try `%prefix%help` for a list of commands" -# Message if a player provides less arguments than required -notEnoughArguments = "Not enough arguments" -# Message if a player provides too many arguments -tooManyArguments = "Too many arguments" -# Message if a player can not be found -# -# PLACEHOLDERS: -# %player% - The player's name -playerNotFound = "Can not find player \"%player%\"" -# The message for 'list' when no player is online -cmdList_empty = "There is no player online..." -# The header for 'list' when one player is online -cmdList_one = "There is 1 player online:" -# The header for 'list' -# PLACEHOLDERS: -# %amount% - The amount of players online -cmdList_header = "There are %amount% players online:" -# Header of the help command -cmdHelp_header = "Your available commands in this channel:" -# Message sent when ignoring Discord messages -commandIgnore_ignore = "You are now ignoring Discord messages!" -# Message sent when unignoring Discord messages -commandIgnore_unignore = "You are no longer ignoring Discord messages!" -# Message sent when using the uptime command -# -# PLACEHOLDERS: -# %uptime% - Uptime in uptime format, see uptimeFormat -cmdUptime_message = "The server is running for %uptime%" -# The format of the uptime command -# For more help with the formatting visit https://commons.apache.org/proper/commons-lang/apidocs/org/apache/commons/lang3/time/DurationFormatUtils.html -uptimeFormat = "dd 'days' HH 'hours' mm 'minutes'" -# Shows when running slash commands as command response -executing = "Executing..." -# Command argument description for the linkcheck command's Discord user parameter -cmdLinkcheck_userargDesc = "The discord user to check" -# Command argument description for the linkcheck command's minecraft player parameter -cmdLinkcheck_mcargDesc = "The minecraft player's UUID(!) to check" -# Sent when checked user is not linked -cmdLinkcheck_notlinked = "This account is not linked!" -# -cmdLinkcheck_discordAcc = "Discord-Account: " -cmdLinkcheck_minecraftAcc = "Minecraft Account: " -cmdLinkcheck_cannotGetPlayer = "Error getting player information! Maybe you used an invalid name / UUID" - -# Command descriptions -[localization.commands.descriptions] -settings = "Allows you to edit your personal settings" -uptime = "Displays the server uptime" -help = "Displays a list of all commands" -list = "Lists all players currently online" -link = "Links your Discord account with your Minecraft account" -whitelist = "Whitelists you on the server by linking with Discord" -linkcheck = "Shows info about an linked discord user or an ingame player" - -# Strings about the account linking feature -[localization.linking] -# Sent to the user when he linked his discord successfully -# PLACEHOLDERS: -# %player% - The in-game player name -# %prefix% - Command prefix -linkSuccessful = "Your account is now linked with %player%.\nUse %prefix%settings here to view and set some user-specific settings" -# Sent to the user when linking fails -linkFailed = "Account link failed" -# Sent when an already linked user attempts to link an account -# PLACEHOLDERS: -# %player% - The in-game player name -alreadyLinked = "Your account is already linked with %player%" -# Sent when attempting to use personal commands while not linked -# PLACEHOLDERS: -# %method% - The currently enabled method for linking -notLinked = "Your account is not linked! Link it first using %method%" -# Message of the link method in whitelist mode -# Used by %method% placeholder -linkMethodWhitelist = "`%prefix%whitelist ` here" -# Message of the link method in normal mode -# Used by %method% placeholder -linkMethodIngame = "`/discord link` ingame" -# Sent when attempting to whitelist-link with an non uuid string -# PLACEHOLDERS: -# %arg% - The provided argument -# %prefix% - Command prefix -link_argumentNotUUID = "Argument \"%arg%\" is not an valid UUID. Use `%prefix%whitelist `" -# Sent when attempting to link with an unknown number -invalidLinkNumber = "Invalid link number! Use `/discord link` ingame to get your link number" -# Sent when attempting to link with an invalid number -linkNumberNAN = "This is not a number. Use `/discord link` ingame to get your link number" -# Message shown to players who are not whitelisted using discord -# No effect if discord whitelist is off -notWhitelisted = "§cYou are not whitelisted.\nJoin the discord server for more information\nhttps://discord.gg/someserver" -# Sent when trying to link without an required role -link_requiredRole = "You need to have an role to use this" -# Sent when trying to link as an non-member -link_notMember = "You are not member of the Discord-Server this bot is operating in!" -# Sent to the user when he linked his discord successfully -# PLACEHOLDERS: -# %name% - The linked discord name -# %name#tag% - The linked discord name with tag -linkSuccessfulIngame = "Your account is now linked with discord-user %name#tag%" -# Message shown to players who want to link their discord account ingame -# -# PLACEHOLDERS: -# %num% - The link number -# %prefix% - Command prefix -linkMsgIngame = "Send this command as a slash command to the bot in the server to link your account: %prefix%link %num%\nThis number will expire after 10 minutes" -# Shown when hovering over the link message -hoverMsg_copyClipboard = "Click to copy command to clipboard" - -# Strings about the personal settings feature -[localization.personalSettings] -# Message for getting an setting's value -personalSettingGet = "This settings value is `%bool%`" -# Sent when user sucessfully updates an prersonal setting -settingUpdateSuccessful = "Successfully updated setting!" -# Header of the personal settings list -personalSettingsHeader = "Personal Settings list:" -# Error message when providing an invalid personal setting name -invalidPersonalSettingKey = "`%key%` is not an valid setting!" -# PLACEHOLDERS: -# %prefix% - Returns the current command prefix -settingsCommandUsage = "Usages:\n\n%prefix%settings - lists all available keys\n%prefix%settings get - Gets the current settings value\n%prefix%settings set - Sets an Settings value" -# Sent when setting an personal setting fails -settingUpdateFailed = "Failed to set value :/" -# Sent when attempting to change an blacklisted setting -settingUpdateBlocked = "The server owner disabled changing of this setting" - -# Descriptions of the settings -[localization.personalSettings.descriptons] -ignoreDiscordChatIngame = "Configure if you want to ignore discord chat ingame" -useDiscordNameInChannel = "Should the bot send messages using your discord name and avatar instead of your in-game name and skin?" -ignoreReactions = "Configure if you want to ignore discord reactions ingame" -pingSound = "Toggle the ingame ping sound" -hideFromDiscord = "Setting this to true will hide all of your minecraft messages from discord" diff --git a/translations/German.toml b/translations/German.toml deleted file mode 100644 index 2957f3f7..00000000 --- a/translations/German.toml +++ /dev/null @@ -1,222 +0,0 @@ -[localization] -# This is what will be displayed ingame when someone types into the bot's channel -# PLACEHOLDERS: -# %user% - The username -# %id% - The user ID -# %msg% - The message -ingame_discordMessage = "§6[§5DISCORD§6]§r <%user%> %msg%" -# This is what will be displayed ingame when someone sends an reply into the bot's channel -# PLACEHOLDERS: -# %user% - The username -# %id% - The user ID -# %msg% - The reply message -# %ruser% - The username of the message that got the reply -# %rmsg% - The replied message -ingame_discordReplyMessage = "§6[§5DISCORD§6]§r §a%user%§r in antwort zu §3%ruser%§r: %msg%" -# Message shown when hovering over the username of an discord message -# PLACEHOLDERS: -# %user% - The username/nickname (Someone123) -# %user#tag% - The username with tag (someone#0001) -# %id% - The user ID -# -# NOTE: using an @ here can cause ping sounds ingame -discordUserHover = "§3Gesendet von Discord-Nutzer %user#tag%\n§aKlicken zum Erwähnen" -# This message will edited in / sent when the server finished starting -serverStarted = "Server gestartet!" -# Message to show while the server is starting -# This will be edited to SERVER_STARTED_MSG when webhook is false -serverStarting = "Server Startet..." -# This message will be sent when the server was stopped -serverStopped = "Server gestoppt!" -# The message to print to discord when it was possible to detect a server crash -serverCrash = "Server Crash erkannt :thinking:" -# Gets sent when an player joins -# -# PLACEHOLDERS: -# %player% - The player's name -playerJoin = "%player% hat den Server betreten" -# Gets sent when an player leaves -# -# PLACEHOLDERS: -# %player% - The player's name -playerLeave = "%player% hat den Server verlassen" -# Gets sent when an player dies -# -# PLACEHOLDERS: -# %player% - The player's name -# %msg% - The death message -playerDeath = "%player% %msg%" -# Message sent instead of playerLeave, when the player times out -# -# PLACEHOLDERS: -# %player% - The player's name -playerTimeout = "%player% timed out!" -# Gets sent when an player finishes an advancement -# Supports MulitLined messages using \n -# -# PLACEHOLDERS: -# %player% - The player's name -# %name% - The advancement name -# %desc% - The advancement description -advancementMessage = "%player% hat den Fortschritt **%name%** erreicht\n_%desc%_" -# The chat message in discord, sent from an player in-game -# -# PLACEHOLDERS: -# %player% - The player's name -# %msg% - The chat message -discordChatMessage = "%player%: %msg%" -# Sent to a player when someone reacts to his messages -# PLACEHOLDERS: -# %name% - (Nick-)Name of the user who reacted (format: 'SomeNickName') -# %name2% - Name of the user who reacted with discord discriminator (format: 'SomeName#0123') -# %msg% - Content of the message which got the reaction -# %emote% - The reacted emote -reactionMessage = "§6[§5DISCORD§6]§r§7 %name% hat auf deine Nachricht \"§9%msg%§7\" mit '%emote%' reagiert" - -# Strings about the discord commands -[localization.commands] -# Shown in console when trying to use the discord command -ingameOnly = "Dieser Befehl kann nur in-game ausgeführt werden" -# Shown when successfully reloading the config file -configReloaded = "Konfiguration neugeladen!" -# Shown when an subcommand is disabled -subcommandDisabled = "Dieser unterbefehl ist deaktiviert!" -# Message sent when user does not have permission to run a command -noPermission = "Du hast keine erlaubnis diesen Befehl auszuführen!" -# Message sent when an invalid command was typed -# -# PLACEHOLDERS: -# %prefix% - Command prefix -unknownCommand = "Unbekannter Befehl, nutze `%prefix%help` für eine Befehlsliste" -# Message if a player provides less arguments than required -notEnoughArguments = "Nicht genug Argumente" -# Message if a player provides too many arguments -tooManyArguments = "Zu viele Argumente" -# Message if a player can not be found -# -# PLACEHOLDERS: -# %player% - The player's name -playerNotFound = "Kann Spieler \"%player%\" nicht finden" -# The message for 'list' when no player is online -cmdList_empty = "Es ist kein Spieler online..." -# The header for 'list' when one player is online -cmdList_one = "Es ist 1 Spieler online:" -# The header for 'list' -# PLACEHOLDERS: -# %amount% - The amount of players online -cmdList_header = "Es sind %amount% Spieler online:" -# Header of the help command -cmdHelp_header = "Deine vorhandenen Befehle in diesem Kanal:" -# Message sent when ignoring Discord messages -commandIgnore_ignore = "Du ignorierst nun Discord-Nachrichten!" -# Message sent when unignoring Discord messages -commandIgnore_unignore = "Du ignorierst nun keine Discord-Nachrichten mehr!" -# Message sent when using the uptime command -# -# PLACEHOLDERS: -# %uptime% - Uptime in uptime format, see uptimeFormat -cmdUptime_message = "Der Server läuft seit%uptime%" -# The format of the uptime command -# For more help with the formatting visit https://commons.apache.org/proper/commons-lang/apidocs/org/apache/commons/lang3/time/DurationFormatUtils.html -uptimeFormat = "dd 'Tagen' HH 'Stunden' mm 'Minuten'" -# Shows when running slash commands as command response -executing = "Wird Ausgeführt..." -# Command argument description for the linkcheck command's Discord user parameter -cmdLinkcheck_userargDesc = "Der zu überprüfende Discord-Nutzer" -# Command argument description for the linkcheck command's minecraft player parameter -cmdLinkcheck_mcargDesc = "Die UUID den Namen des zu überprüfenden Minecraft-Spielers" -# Sent when checked user is not linked -cmdLinkcheck_notlinked = "Dieser Account ist nicht verbunden!" -# -cmdLinkcheck_discordAcc = "Discord-Account: " -cmdLinkcheck_minecraftAcc = "Minecraft Account: " -cmdLinkcheck_cannotGetPlayer = "Fehler beim Abrufen von Spielerinformationen! Vielleicht hast du einen falschen Namen / eine falsche UUID angegeben" - -# Command descriptions -[localization.commands.descriptions] -settings = "Erlaubt es dir, deine Persönlchen Einstellungen zu ändern" -uptime = "Zeigt die Uptime des Servers an" -help = "Zeigt eine Liste aller Befehle" -list = "Listet alle Spieler, die auf dem Server online sind" -link = "Verbindet deinen Discord-Account mit deinem Minecraft Account" -whitelist = "Fügt dich zur Discord-Basierten Whitelist des Servers hinzu" -linkcheck = "Zeigt informationen über einen verbundenen Discord-Account oder Ingame-Spieler" - -# Strings about the account linking feature -[localization.linking] -# Sent to the user when he linked his discord successfully -# PLACEHOLDERS: -# %player% - The in-game player name -# %prefix% - Command prefix -linkSuccessful = "Dein Account ist jetzt mit %player% verbunden.\nNutze %prefix%settings hier um persönliche Einstellungen vorzunehmen" -# Sent to the user when linking fails -linkFailed = "Accountverbindung Fehlgeschlagen" -# Sent when an already linked user attempts to link an account -# PLACEHOLDERS: -# %player% - The in-game player name -alreadyLinked = "Dein Account ist bereits mit %player% verbunden" -# Sent when attempting to use personal commands while not linked -# PLACEHOLDERS: -# %method% - The currently enabled method for linking -notLinked = "Dein Account ist nicht Verbunden! Verbinde ihn erst mit %method%" -# Message of the link method in whitelist mode -# Used by %method% placeholder -linkMethodWhitelist = "`%prefix%whitelist ` hier" -# Message of the link method in normal mode -# Used by %method% placeholder -linkMethodIngame = "`/discord link` ingame" -# Sent when attempting to whitelist-link with an non uuid string -# PLACEHOLDERS: -# %arg% - The provided argument -# %prefix% - Command prefix -link_argumentNotUUID = "Argument \"%arg%\" ist keine Valide UUID. Nutze `%prefix%whitelist `" -# Sent when attempting to link with an unknown number -invalidLinkNumber = "Unbekannte Link-Nummer Nutze `/discord link` ingame um eine zu erhalten" -# Sent when attempting to link with an invalid number -linkNumberNAN = "Das ist keine Zahl. Nutze `/discord link` ingame um eine Link-Nummer zu erhalten" -# Message shown to players who are not whitelisted using discord -# No effect if discord whitelist is off -notWhitelisted = "§cDu bist nicht Whitelisted.\nKomm auf unseren Discord für weitere Informationen\nhttps://discord.gg/myserver" -# Sent when trying to link without an required role -link_requiredRole = "Du musst eine bestimmte Rolle haben um deinen Account zu verbinden" -# Sent when trying to link as an non-member -link_notMember = "Du bist nicht auf dem Discord-Server auf dem der Bot arbeitet!" -# Sent to the user when he linked his discord successfully -# PLACEHOLDERS: -# %name% - The linked discord name -# %name#tag% - The linked discord name with tag -linkSuccessfulIngame = "Dein Account ist nun mit dem Discord-Nutzer %name#tag% verbunden" -# Message shown to players who want to link their discord account ingame -# -# PLACEHOLDERS: -# %num% - The link number -# %prefix% - Command prefix -linkMsgIngame = "Sende diesen Befehl als Direkt-Nachricht an den Bot: %prefix%link %num%\nDiese Nummer läuft nach 10 Minuten ab" -# Shown when hovering over the link message -hoverMsg_copyClipboard = "Klicken um Befehl zu Kopieren" - -# Strings about the personal settings feature -[localization.personalSettings] -# Message for getting an setting's value -personalSettingGet = "Der Wert dieser Einstellung ist `%bool%`" -# Sent when user sucessfully updates an prersonal setting -settingUpdateSuccessful = "Einstellung erfolgreich aktualisiert!" -# Header of the personal settings list -personalSettingsHeader = "Liste der persönlichen Einstellungen:" -# Error message when providing an invalid personal setting name -invalidPersonalSettingKey = "`%key%` ist keine valide Einstellung!" -# PLACEHOLDERS: -# %prefix% - Returns the current command prefix -settingsCommandUsage = "Nutzung:\n\n%prefix%settings - Listet alle vorhandenen Einstellungen\n%prefix%settings get - Gibt den aktuellen Wert der Einstellung aus\n%prefix%settings set - Setzt den Wert der Einstellung" -# Sent when setting an personal setting fails -settingUpdateFailed = "Konnte Wert nicht setzen :/" -# Sent when attempting to change an blacklisted setting -settingUpdateBlocked = "Der Server-Owner hat das ändern dieser Einstellung deaktiviert" - -# Descriptions of the settings -[localization.personalSettings.descriptons] -ignoreDiscordChatIngame = "Aktivieren, um Discord-Nachrichten in-game komplett abzuschalten" -useDiscordNameInChannel = "Soll der Bot deinen Discord Namen anstelle deines Minecraft Namens in Discord verwenden?" -ignoreReactions = "Aktivieren, um Reaktionen von Nachrichten in Discord zu ignorieren" -pingSound = "(De-)Aktiviere den ingame Ping-Sound" -hideFromDiscord = "Aktivieren, um keine Discord-Nachrichten zu senden" \ No newline at end of file diff --git a/translations/README.md b/translations/README.md deleted file mode 100644 index c9a9c1f1..00000000 --- a/translations/README.md +++ /dev/null @@ -1,3 +0,0 @@ -This directory contains pre-translated localization config sections - -You can install them by simply pasting them in your config file (replace the default localization section) \ No newline at end of file