diff --git a/commands/General/minecraft.js b/commands/General/minecraft.js index 1ab097d4..22679cf7 100644 --- a/commands/General/minecraft.js +++ b/commands/General/minecraft.js @@ -62,19 +62,13 @@ class Minecraft extends Command { const embed = new Discord.MessageEmbed() .setAuthor({ - name: message.translate("general/minecraft:FIELD_NAME", { - ip: json.name - }) + name: json.name }) - .addField(message.translate("general/minecraft:FIELD_VERSION"), json.raw.vanilla.raw.version.name) - .addField(message.translate("general/minecraft:FIELD_CONNECTED"), message.translate("general/minecraft:PLAYERS", { - count: (json.raw.players ? json.raw.players.online : json.players.length) - })) - .addField(message.translate("general/minecraft:FIELD_MAX"), message.translate("general/minecraft:PLAYERS", { - count: (json.raw.players ? json.raw.players.max : json.maxplayers) - })) .addField(message.translate("general/minecraft:FIELD_STATUS"), message.translate("general/minecraft:ONLINE")) - .addField(message.translate("general/minecraft:FIELD_IP"), json.connect) + .addField(message.translate("general/minecraft:FIELD_CONNECTED"), `**${(json.raw.players ? json.raw.players.online : json.players.length)}** ${message.getNoun((json.raw.players ? json.raw.players.online : json.players.length), message.translate("misc:NOUNS:PLAYERS:1"), message.translate("misc:NOUNS:PLAYERS:2"), message.translate("misc:NOUNS:PLAYERS:5"))} / **${(json.raw.players ? json.raw.players.max : json.maxplayers)}** ${message.getNoun((json.raw.players ? json.raw.players.max : json.maxplayers), message.translate("misc:NOUNS:PLAYERS:1"), message.translate("misc:NOUNS:PLAYERS:2"), message.translate("misc:NOUNS:PLAYERS:5"))}`) + .addField(message.translate("general/minecraft:FIELD_IP"), json.connect, true) + .addField(message.translate("general/minecraft:FIELD_VERSION"), json.raw.vanilla.raw.version.name, true) + .addField(message.translate("general/minecraft:FIELD_PING"), json.raw.vanilla.ping.toString()) .setColor(data.config.embed.color) .setThumbnail(favicon) .setFooter({ diff --git a/languages/ru-RU/general/minecraft.json b/languages/ru-RU/general/minecraft.json index 95435b2c..8fb6425d 100644 --- a/languages/ru-RU/general/minecraft.json +++ b/languages/ru-RU/general/minecraft.json @@ -7,10 +7,9 @@ "ONLINE": "Онлайн", "OFFLINE": "Оффлайн", "PLAYERS": "{{count}} игрок(а/ов)", - "FIELD_NAME": "Информация об {{ip}}", "FIELD_VERSION": "Версия", "FIELD_CONNECTED": "Игроков на сервере", - "FIELD_MAX": "Максимум", "FIELD_STATUS": "Статус", + "FIELD_PING": "Пинг", "FIELD_IP": "Полный IP" } \ No newline at end of file diff --git a/languages/ru-RU/misc.json b/languages/ru-RU/misc.json index 85fd960a..9d1bb2c8 100644 --- a/languages/ru-RU/misc.json +++ b/languages/ru-RU/misc.json @@ -105,6 +105,11 @@ "2": "пользователя", "5": "пользователей" }, + "PLAYERS": { + "1": "игрок", + "2": "игрока", + "5": "игроков" + }, "BOTS": { "1": "бот", "2": "бота", diff --git a/languages/uk-UA/general/minecraft.json b/languages/uk-UA/general/minecraft.json index f1d81bee..64e6aaac 100644 --- a/languages/uk-UA/general/minecraft.json +++ b/languages/uk-UA/general/minecraft.json @@ -7,10 +7,9 @@ "ONLINE": "Онлайн", "OFFLINE": "Оффлайн", "PLAYERS": "{{count}} гравець(я/ів)", - "FIELD_NAME": "Інформація про {{ip}}", "FIELD_VERSION": "Версія", "FIELD_CONNECTED": "Гравців на сервері", - "FIELD_MAX": "Максимум", "FIELD_STATUS": "Статус", + "FIELD_PING": "Пінг", "FIELD_IP": "Повний IP" - } \ No newline at end of file +} \ No newline at end of file