This commit is contained in:
7cc5c4f330d47060 2024-09-12 00:18:41 -04:00
parent 28ebfc7b62
commit a85269ecce
Signed by: 7cc5c4f330d47060
SSH key fingerprint: SHA256:e+4tcZut1nBpe10PqjaO+Rvie0Q7W4qIvFzcUw+7riA
6 changed files with 20 additions and 20 deletions

View file

@ -239,8 +239,8 @@ const displayServerList = function (c) {
module.exports = { module.exports = {
execute: function (c) { execute: function (c) {
let subcmd; let subcmd
if(c.args.length>=1) subcmd = c.args[0].toLowerCase(); if (c.args.length >= 1) subcmd = c.args[0].toLowerCase()
if (subcmd === 'servers') subcmd = 'serverlist' if (subcmd === 'servers') subcmd = 'serverlist'
if (c.cmdName.toLowerCase() === 'serverinfo' || c.cmdName.toLowerCase() === 'specs') subcmd = 'server' if (c.cmdName.toLowerCase() === 'serverinfo' || c.cmdName.toLowerCase() === 'specs') subcmd = 'server'
if (c.cmdName.toLowerCase() === 'serverlist' || c.cmdName.toLowerCase() === 'servers') subcmd = 'serverlist' if (c.cmdName.toLowerCase() === 'serverlist' || c.cmdName.toLowerCase() === 'servers') subcmd = 'serverlist'

View file

@ -1,8 +1,8 @@
const { getMessage } = require('../util/lang.js') const { getMessage } = require('../util/lang.js')
module.exports = { module.exports = {
execute: (c) => { execute: (c) => {
let subcmd; let subcmd
if(c.args.length>=1) subcmd = c.args.splice(0, 1)[0].toLowerCase(); if (c.args.length >= 1) subcmd = c.args.splice(0, 1)[0].toLowerCase()
switch (subcmd) { switch (subcmd) {
case 'add': { case 'add': {
const rate = +(c.args.splice(0, 1)[0]) const rate = +(c.args.splice(0, 1)[0])

View file

@ -65,8 +65,8 @@ const printHelp = (c) => {
} }
const printCmdHelp = (c) => { const printCmdHelp = (c) => {
let cmd; let cmd
if(c.args.length>=1) cmd = c.args[0].toLowerCase(); if (c.args.length >= 1) cmd = c.args[0].toLowerCase()
if (!cmds[cmd] || (cmds[cmd].hidden && c.type !== 'console')) { if (!cmds[cmd] || (cmds[cmd].hidden && c.type !== 'console')) {
c.reply({ text: getMessage(c.lang, 'command.help.noCommand') }) c.reply({ text: getMessage(c.lang, 'command.help.noCommand') })
return return

View file

@ -17,8 +17,8 @@ module.exports = {
}) })
return return
} }
let subcmd; let subcmd
if(c.args.length>=1) subcmd = c.args.splice(0, 1)[0].toLowerCase(); if (c.args.length >= 1) subcmd = c.args.splice(0, 1)[0].toLowerCase()
switch (subcmd) { switch (subcmd) {
case 'set':{ case 'set':{
const allowedKeys = ['colorPrimary', 'colorSecondary', 'lang'] const allowedKeys = ['colorPrimary', 'colorSecondary', 'lang']

View file

@ -117,8 +117,8 @@ module.exports = {
b._client.on('system_chat', (data) => { b._client.on('system_chat', (data) => {
const json = parse1204(data.content) const json = parse1204(data.content)
if(json.translate == '%s %s %s'){ // ChipmunkMod format if (json.translate === '%s %s %s') { // ChipmunkMod format
if(json.with && json.with[1] && json.with[2]){ if (json.with && json.with[1] && json.with[2]) {
const username = parsePlain(json.with[1]) const username = parsePlain(json.with[1])
const uuid = b.findUUID(username) const uuid = b.findUUID(username)
const nickname = b.findDisplayName(uuid) const nickname = b.findDisplayName(uuid)
@ -135,13 +135,13 @@ module.exports = {
b.emit('chat', { b.emit('chat', {
json, json,
type: 'system', type: 'system',
uuid: "00000000-0000-0000-0000-000000000000", uuid: '00000000-0000-0000-0000-000000000000',
message: "", message: '',
nickname: "", nickname: '',
username: "" username: ''
}) })
} }
} else if(json.extra && json.extra[4] && json.extra[3] && json.extra[5] && json.extra[4].text == ' » '){ // ChipmunkMod format - m_c_player } else if (json.extra && json.extra[4] && json.extra[3] && json.extra[5] && json.extra[4].text === ' » ') { // ChipmunkMod format - m_c_player
const username = parsePlain(json.extra[3]) const username = parsePlain(json.extra[3])
const uuid = b.findUUID(username) const uuid = b.findUUID(username)
const nickname = b.findDisplayName(uuid) const nickname = b.findDisplayName(uuid)
@ -181,19 +181,19 @@ module.exports = {
let username let username
let message let message
let uuid let uuid
if(json.translate == '%s %s %s'){ // ChipmunkMod format if (json.translate === '%s %s %s') { // ChipmunkMod format
if(json.with && json.with[1] && json.with[2]){ if (json.with && json.with[1] && json.with[2]) {
username = parsePlain(json.with[1]) username = parsePlain(json.with[1])
uuid = b.findUUID(username) uuid = b.findUUID(username)
nickname = b.findDisplayName(uuid) nickname = b.findDisplayName(uuid)
message = parsePlain(json.with[2].extra) message = parsePlain(json.with[2].extra)
} }
} else if(json.extra && json.extra[4] && json.extra[3] && json.extra[5] && json.extra[4].text == ' » '){ // ChipmunkMod format - m_c_player } else if (json.extra && json.extra[4] && json.extra[3] && json.extra[5] && json.extra[4].text === ' » ') { // ChipmunkMod format - m_c_player
username = parsePlain(json.extra[3]) username = parsePlain(json.extra[3])
uuid = b.findUUID(username) uuid = b.findUUID(username)
nickname = b.findDisplayName(uuid) nickname = b.findDisplayName(uuid)
message = parsePlain(json.extra[5]) message = parsePlain(json.extra[5])
} else if (b.host.options.isVanilla && json.translate === 'chat.type.text') { // Servers without Extras chat } else if (b.host.options.isVanilla && json.translate === 'chat.type.text') { // Servers without Extras chat
if (json.with && json.with.length >= 2) { if (json.with && json.with.length >= 2) {
message = parsePlain(json.with[1]) message = parsePlain(json.with[1])
username = parsePlain(json.with[0]) username = parsePlain(json.with[0])

View file

@ -1,7 +1,7 @@
const index = require('../index.js') const index = require('../index.js')
const parse = require('../util/chatparse_console.js') const parse = require('../util/chatparse_console.js')
const settings = require('../settings.json') const settings = require('../settings.json')
const version = require("../version.json") const version = require('../version.json')
class ConsoleCommand { class ConsoleCommand {
constructor (cmd, index2) { constructor (cmd, index2) {
this.send = () => {} this.send = () => {}