From 919bc90365460f07b0010bbe190d0bfe42289789 Mon Sep 17 00:00:00 2001 From: 7cc5c4f330d47060 Date: Sat, 24 Aug 2024 10:15:39 -0400 Subject: [PATCH] Lint --- commands/about.js | 16 +++++------ commands/cloop.js | 2 +- commands/netmsg.js | 10 +++---- commands/settings.js | 2 +- commands/test.js | 2 +- index.js | 10 +++---- plugins/!chat.js | 58 +++++++++++++++++++-------------------- util/chatparse_console.js | 26 +++++++++--------- util/chatparse_mc.js | 36 ++++++++++++------------ util/lang.js | 4 +-- util/usergen.js | 8 +++--- 11 files changed, 87 insertions(+), 87 deletions(-) diff --git a/commands/about.js b/commands/about.js index c4f5610..a7d981f 100644 --- a/commands/about.js +++ b/commands/about.js @@ -112,7 +112,7 @@ const aboutServer = function (c) { text: thisItem, color: c.colors.primary, clickEvent: { - action: "copy_to_clipboard", + action: 'copy_to_clipboard', value: thisItem }, hoverEvent: { @@ -201,10 +201,10 @@ const aboutServer = function (c) { } const displayServerList = function (c) { - index.bot.forEach((item, i)=>{ + index.bot.forEach((item, i) => { if (item.host.options && item.host.options.hidden && c.verify !== 3 && c.bot.id !== i) return - let message = 'command.about.serverListItem'; - if(c.bot.id == i) message = 'command.about.serverListItem.thisServer' + let message = 'command.about.serverListItem' + if (c.bot.id === i) message = 'command.about.serverListItem.thisServer' c.reply({ translate: getMessage(c.lang, message), color: c.colors.secondary, @@ -217,7 +217,7 @@ const displayServerList = function (c) { text: `${item.host.host}:${item.host.port}`, color: c.colors.primary, clickEvent: { - action: "copy_to_clipboard", + action: 'copy_to_clipboard', value: `${item.host.host}:${item.host.port}` }, hoverEvent: { @@ -240,9 +240,9 @@ const displayServerList = function (c) { module.exports = { execute: function (c) { let subcmd = c.args[0] - if(subcmd === "servers") subcmd = "serverlist" - if(c.cmdName === "serverinfo") subcmd = "server" - if(c.cmdName === "serverlist" || c.cmdName === "servers") subcmd = "serverlist" + if (subcmd === 'servers') subcmd = 'serverlist' + if (c.cmdName === 'serverinfo') subcmd = 'server' + if (c.cmdName === 'serverlist' || c.cmdName === 'servers') subcmd = 'serverlist' if (subcmd === 'server') { aboutServer(c) } else if (subcmd === 'serverlist') { diff --git a/commands/cloop.js b/commands/cloop.js index b09254e..ef35b0c 100644 --- a/commands/cloop.js +++ b/commands/cloop.js @@ -44,7 +44,7 @@ module.exports = { break } case 'list': - c.bot.cloops.forEach((item, i)=>{ + c.bot.cloops.forEach((item, i) => { c.reply({ translate: getMessage(c.lang, 'command.cloop.list'), color: c.colors.secondary, diff --git a/commands/netmsg.js b/commands/netmsg.js index 814a5c6..6d77595 100644 --- a/commands/netmsg.js +++ b/commands/netmsg.js @@ -4,9 +4,9 @@ module.exports = { execute: (c) => { let host = c.host let port = c.port - if(c.bot.host.options && c.bot.host.options.hidden){ - host = "localhost" // Makes hidden servers appear as localhost - port = "25565" + if (c.bot.host.options && c.bot.host.options.hidden) { + host = 'localhost' // Makes hidden servers appear as localhost + port = '25565' } const json = { translate: '[%s] %s: %s', @@ -14,12 +14,12 @@ module.exports = { { text: c.serverName, hoverEvent: { - action: "show_text", + action: 'show_text', value: { translate: '%s: %s:%s', with: [ { - text: getMessage(c.lang, "command.netmsg.serverAddress"), + text: getMessage(c.lang, 'command.netmsg.serverAddress'), color: c.colors.primary }, { diff --git a/commands/settings.js b/commands/settings.js index 550a3ab..42fd711 100644 --- a/commands/settings.js +++ b/commands/settings.js @@ -2,7 +2,7 @@ const { languages, getMessage } = require('../util/lang.js') const fs = require('fs') module.exports = { execute: (c) => { - if(c.type == "console"){ + if (c.type === 'console') { c.reply({ text: getMessage(c.lang, 'command.settings.disabled.console'), color: c.colors.secondary diff --git a/commands/test.js b/commands/test.js index 28d6d6c..4b716b6 100644 --- a/commands/test.js +++ b/commands/test.js @@ -14,7 +14,7 @@ module.exports = { text: item, color: c.colors.primary, clickEvent: { - action: "copy_to_clipboard", + action: 'copy_to_clipboard', value: item }, hoverEvent: { diff --git a/index.js b/index.js index d6d9005..ce936a3 100755 --- a/index.js +++ b/index.js @@ -1,14 +1,14 @@ const fs = require('fs') if (!fs.readdirSync('.').includes('settings.json')) { - console.log("Settings file is missing, using defaults.") - fs.copyFileSync("settings_example.json", "settings.json") + console.log('Settings file is missing, using defaults.') + fs.copyFileSync('settings_example.json', 'settings.json') } if (!fs.readdirSync('.').includes('secret.json')) { - console.log("Secrets file is missing, using defaults.") - fs.copyFileSync("secret_example.json", "secret.json") - console.log("Please change the hashing keys in the secrets file.") + console.log('Secrets file is missing, using defaults.') + fs.copyFileSync('secret_example.json', 'secret.json') + console.log('Please change the hashing keys in the secrets file.') } const m = require('minecraft-protocol') diff --git a/plugins/!chat.js b/plugins/!chat.js index dd98dc1..4a17a70 100755 --- a/plugins/!chat.js +++ b/plugins/!chat.js @@ -3,14 +3,14 @@ const parsePlain = require('../util/chatparse_plain.js') const parseConsole = require('../util/chatparse_console.js') const parse1204 = require('../util/parseNBT.js') const convertChatStyleItem = (item) => { - let output={}; - for(const i in item){ + const output = {} + for (const i in item) { output[i] = item[i].value } - return output; + return output } const convertChatTypeItem = (item) => { - if(item.style){ + if (item.style) { return { translation_key: item.translation_key.value, parameters: item.parameters.value.value, @@ -26,11 +26,11 @@ const convertChatTypeItem = (item) => { } module.exports = { load: (b) => { - b.messageTypes = []; - b._client.on("registry_data",(data)=>{ - if(data.codec.value['minecraft:chat_type']){ + b.messageTypes = [] + b._client.on('registry_data', (data) => { + if (data.codec.value['minecraft:chat_type']) { b.messageTypes = data.codec.value['minecraft:chat_type'] - const nbtItems = data.codec.value['minecraft:chat_type'].value.value.value.value; + const nbtItems = data.codec.value['minecraft:chat_type'].value.value.value.value nbtItems.forEach((item, i) => { b.messageTypes[i] = convertChatTypeItem(item.element.value.chat.value) }) @@ -38,24 +38,24 @@ module.exports = { }) b._client.on('profileless_chat', (data) => { const messageType = b.messageTypes[data.type] - let json = {translate: messageType.translation_key, with: []} - messageType.parameters.forEach((item, i)=>{ - if(item == "content"){ + const json = { translate: messageType.translation_key, with: [] } + messageType.parameters.forEach((item, i) => { + if (item === 'content') { json.with[i] = parse1204(data.message) - } else if(item == "sender"){ + } else if (item === 'sender') { json.with[i] = parse1204(data.name) - } else if(item == "target"){ + } else if (item === 'target') { json.with[i] = parse1204(data.target) } }) - for(const i in messageType.style){ + for (const i in messageType.style) { json[i] = messageType.style[i] } - let username = "" - let nickname = "" - let uuid = "00000000-0000-0000-0000-000000000000" - let message = "" - if (messageType.translation_key == "%s") { + let username = '' + let nickname = '' + let uuid = '00000000-0000-0000-0000-000000000000' + let message = '' + if (messageType.translation_key === '%s') { const parsed = parsePlain(json) const split = parsed.split(': ') const chatName = split.splice(0, 1)[0] @@ -63,7 +63,7 @@ module.exports = { nickname = chatNameSplit[chatNameSplit.length - 1] username = b.findRealName(chatName) uuid = b.findUUID(username) - message = split.join(": ") + message = split.join(': ') } else { message = parsePlain(parse1204(data.message)) uuid = b.findUUID(parsePlain(parse1204(data.name))) @@ -71,7 +71,7 @@ module.exports = { username = parsePlain(parse1204(data.name)) } b.emit('chat', { - json: json, + json, type: 'profileless', uuid, message, @@ -82,25 +82,25 @@ module.exports = { b._client.on('player_chat', (data) => { const messageType = b.messageTypes[data.type] - let json = {translate: messageType.translation_key, with: []} - messageType.parameters.forEach((item, i)=>{ - if(item == "content"){ - if(messageType.translation_key === "%s"){ + const json = { translate: messageType.translation_key, with: [] } + messageType.parameters.forEach((item, i) => { + if (item === 'content') { + if (messageType.translation_key === '%s') { json.with[i] = parse1204(data.unsignedChatContent) } else { json.with[i] = data.plainMessage } - } else if(item == "sender"){ + } else if (item === 'sender') { json.with[i] = parse1204(data.networkName) - } else if(item == "target"){ + } else if (item === 'target') { json.with[i] = parse1204(data.networkTargetName) } }) - for(const i in messageType.style){ + for (const i in messageType.style) { json[i] = messageType.style[i] } b.emit('chat', { - json: json, + json, type: 'player', uuid: data.senderUuid, message: data.plainMessage, diff --git a/util/chatparse_console.js b/util/chatparse_console.js index d9fdbb4..743a2f8 100644 --- a/util/chatparse_console.js +++ b/util/chatparse_console.js @@ -11,19 +11,19 @@ if (_consoleColors[settings.terminalMode]) { consoleColors = _consoleColors.none.fourBit consoleColors24 = _consoleColors.none.twentyFourBit } -const process8bitColorChannel = (value)=>{ - if(value < 65) return 0 - if(value < 115) return 1 - if(value < 155) return 2 - if(value < 195) return 3 - if(value < 235) return 4 +const process8bitColorChannel = (value) => { + if (value < 65) return 0 + if (value < 115) return 1 + if (value < 155) return 2 + if (value < 195) return 3 + if (value < 235) return 4 return 5 } const hexColorParser = (color) => { if (!consoleColors24.enabled || consoleColors24.bit === 4) { // Hex color parsing to the 4 bit mode has not been implemented yet return '' } - if(consoleColors24.bit == 24){ + if (consoleColors24.bit === 24) { let out = '\x1B[0;' const redChannel = Number(`0x${color.slice(1, 3)}`) const greenChannel = Number(`0x${color.slice(3, 5)}`) @@ -34,7 +34,7 @@ const hexColorParser = (color) => { out += '48;2;0;0;0;' } return out + `38;2;${redChannel};${greenChannel};${blueChannel}m` - } else if(consoleColors24.bit == 8){ + } else if (consoleColors24.bit === 8) { let out = '\x1B[0;' const redChannel = Number(`0x${color.slice(1, 3)}`) const greenChannel = Number(`0x${color.slice(3, 5)}`) @@ -44,10 +44,10 @@ const hexColorParser = (color) => { } else if (consoleColors24.lightMode && ((redChannel > 194 && greenChannel > 194 && blueChannel > 194) || greenChannel > 154)) { out += '48;5;16;' } - let redOut = process8bitColorChannel(redChannel); - let greenOut = process8bitColorChannel(greenChannel); - let blueOut = process8bitColorChannel(blueChannel); - let colorValue = 16 + 36 * redOut + 6 * greenOut + blueOut + const redOut = process8bitColorChannel(redChannel) + const greenOut = process8bitColorChannel(greenChannel) + const blueOut = process8bitColorChannel(blueChannel) + const colorValue = 16 + 36 * redOut + 6 * greenOut + blueOut return out + `38;5;${colorValue}m` } } @@ -101,7 +101,7 @@ const parse = function (_data, l = 0, resetColor = consoleColors.reset) { if (lang[trans] !== undefined) { trans = lang[trans].replace(/%%/g, '\ue123') } - if(data.with){ + if (data.with) { data.with.forEach((item, i) => { const j2 = parse(item, l + 1, data.color ? processColor(data.color, resetColor) : resetColor) trans = trans.replace(/%s/, j2.replaceAll('%s', '\ud900\ud804').replaceAll('$s', '\ud900\ud805')) diff --git a/util/chatparse_mc.js b/util/chatparse_mc.js index eceb1ca..d7dfef3 100644 --- a/util/chatparse_mc.js +++ b/util/chatparse_mc.js @@ -1,23 +1,23 @@ const lang = require('./mc_lang.js') const consoleColors = { - dark_red: "§4", - red: "§c", - dark_green: "§2", - green: "§a", - gold: "§6", - yellow: "§e", - dark_blue: "§1", - blue: "§9", - dark_purple: "§5", - light_purple: "§d", - dark_aqua: "§3", - aqua: "§b", - black: "§0", - gray: "§7", - dark_gray: "§8", - white: "§f", - reset: "§r§f" + dark_red: '§4', + red: '§c', + dark_green: '§2', + green: '§a', + gold: '§6', + yellow: '§e', + dark_blue: '§1', + blue: '§9', + dark_purple: '§5', + light_purple: '§d', + dark_aqua: '§3', + aqua: '§b', + black: '§0', + gray: '§7', + dark_gray: '§8', + white: '§f', + reset: '§r§f' } const processColor = (col, rcol) => { @@ -67,7 +67,7 @@ const parse = function (_data, l = 0, resetColor = consoleColors.reset) { if (lang[trans] !== undefined) { trans = lang[trans].replace(/%%/g, '\ue123') } - if(data.with){ + if (data.with) { data.with.forEach((item, i) => { const j2 = parse(item, l + 1, data.color ? processColor(data.color, resetColor) : resetColor) trans = trans.replace(/%s/, j2.replaceAll('%s', '\ud900\ud804').replaceAll('$s', '\ud900\ud805')) diff --git a/util/lang.js b/util/lang.js index c212973..44ce2f3 100644 --- a/util/lang.js +++ b/util/lang.js @@ -21,8 +21,8 @@ const getMessage = function (l, msg, with2) { } else if (languages['en-US'] && languages['en-US'][message] !== undefined) { message = languages['en-US'][message].replace(/%%/g, '\ue123') } - if (with2){ - with2.forEach((withItem, i)=>{ + if (with2) { + with2.forEach((withItem, i) => { message = message.replace(/%s/, withItem.replace(/%s/g, '\ue124').replace(/\$s/g, '\ue125')) message = message.replaceAll(`%${+i + 1}$s`, withItem.replace(/%s/g, '\ue124').replace(/\$s/g, '\ue125')) }) diff --git a/util/usergen.js b/util/usergen.js index cf2f9e9..394c8e3 100644 --- a/util/usergen.js +++ b/util/usergen.js @@ -32,12 +32,12 @@ const rsg = function (count) { } const rsgLegal = function (count) { let output = '' - if(Math.random()>0.5){ - output += "uwu_" + if (Math.random() > 0.5) { + output += 'uwu_' } else { - output += "owo_" + output += 'owo_' } - output += crypto.randomBytes(count).toString("hex") + output += crypto.randomBytes(count).toString('hex') return output } module.exports = function (legal) {