Update README.md

If it causes problems, botvX

README.md

@@ -1,16 +1,20 @@
-# botvX
+# owobot
 
-botvX is a Minecraft bot originally designed for [Kaboom](https://kaboom.pw/) and its clones. It has many of the features that you would expect in a modern Kaboom bot:
+owobot is a Minecraft bot originally designed for [Kaboom](https://kaboom.pw/) and its clones. It has many of the features that you would expect in a modern Kaboom bot:
 
 - commands (obviously)
 - a self care system
 - a command core, to run commands quickly
 - a hashing system, to enable trusted users to securely run certain commands in chat
 
+If you are not sure if this code is safe to run, you can read through every line of code. You can also see the commit history by clicking on the (n) commits button, to make sure nobody added any exploits to the code.
+
+If you find any exploits, security issues, etc in the code, please send me an issue or pull request and I will try to respond to it whenever I see it.
+
 ## How to install?
 
 1. Install [Node.js](https://nodejs.org/) for your operating system.
-2. Download the latest release, or alternatively, download the latest development version using `git clone https://code.chipmunk.land/7cc5c4f330d47060/botvX`.
+2. Download the latest release, or alternatively, download the latest development version using `git clone https://code.chipmunk.land/7cc5c4f330d47060/owobot`.
 3. Extract the files if necessary.
 4. Run `npm install` in the bot's directory. If it doesn't work, try using the Node.js command prompt, or adding Node.js to your PATH.
 5. Copy `settings_example.json` to `settings.json` and `secret_example.json` to `secret.json`, and adjust the settings to fit your needs. Change the example keys in secret.json as well. 

commands/about.js

@@ -239,10 +239,11 @@ const displayServerList = function (c) {
 
 module.exports = {
   execute: function (c) {
-    let subcmd = c.args[0]
+    let subcmd
+    if (c.args.length >= 1) subcmd = c.args[0].toLowerCase()
     if (subcmd === 'servers') subcmd = 'serverlist'
-    if (c.cmdName === 'serverinfo') subcmd = 'server'
-    if (c.cmdName === 'serverlist' || c.cmdName === 'servers') subcmd = 'serverlist'
+    if (c.cmdName.toLowerCase() === 'serverinfo' || c.cmdName.toLowerCase() === 'specs') subcmd = 'server'
+    if (c.cmdName.toLowerCase() === 'serverlist' || c.cmdName.toLowerCase() === 'servers') subcmd = 'serverlist'
     if (subcmd === 'server') {
       aboutServer(c)
     } else if (subcmd === 'serverlist') {
@@ -251,5 +252,5 @@ module.exports = {
       aboutBot(c)
     }
   },
-  aliases: ['info', 'serverlist', 'servers', 'serverinfo']
+  aliases: ['info', 'serverlist', 'servers', 'serverinfo', 'specs']
 }

commands/cloop.js

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

commands/help.js

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

commands/settings.js

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

lang/en-US.json

@@ -32,16 +32,18 @@
 	"command.say.desc": "Sends a message to chat",
 	"command.settings.usage": " get|| set <key> <value>",
 	"command.settings.desc": "Set your user preferences",
+	"command.restart.usage": "",
+	"command.restart.desc": "Restart bot",
 	"command.stop.usage": "",
-	"command.stop.desc": "Restart bot",
+	"command.stop.desc": "Stop bot",
 	"command.template.usage": " <required> [optional]",
 	"command.template.desc": "Does nothing",
 	"command.test.usage": " [args...]",
 	"command.test.desc": "Chat parsing debugger command",
     "command.tpr.usage": "",
 	"command.tpr.desc": "Teleport to a random location",
-	"command.verify.usage": " [args...]",
-	"command.verify.desc": "Check the hashing system",
+	"command.validate.usage": " [args...]",
+	"command.validate.desc": "Check the hashing system",
 	"command.about.author": "%s - a Minecraft bot made by %s for Kaboom and clones",
 	"command.about.version": "Version %s",
 	"command.about.preRelease": "This is a development version - there may be errors, and features may be changed or removed at any time. Please report any errors to the bot's developer.",

plugins/!chat.js

@@ -117,21 +117,60 @@ module.exports = {
 
     b._client.on('system_chat', (data) => {
       const json = parse1204(data.content)
-      const parsed = parsePlain(json)
-      const split = parsed.split(': ')
-      const chatName = split.splice(0, 1)[0]
-      const chatNameSplit = chatName.split(' ')
-      const nickname = chatNameSplit[chatNameSplit.length - 1]
-      const username = b.findRealName(chatName)
-      const uuid = b.findUUID(username)
-      b.emit('chat', {
-        json,
-        type: 'system',
-        uuid,
-        message: split.join(': '),
-        nickname,
-        username
-      })
+      if (json.translate === '%s %s › %s') { // ChipmunkMod format
+        if (json.with && json.with[1] && json.with[2]) {
+          const username = parsePlain(json.with[1])
+          const uuid = b.findUUID(username)
+          const nickname = b.findDisplayName(uuid)
+          const message = parsePlain(json.with[2].extra)
+          b.emit('chat', {
+            json,
+            type: 'system',
+            uuid,
+            message,
+            nickname,
+            username
+          })
+        } else {
+          b.emit('chat', {
+            json,
+            type: 'system',
+            uuid: '00000000-0000-0000-0000-000000000000',
+            message: '',
+            nickname: '',
+            username: ''
+          })
+        }
+      } 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 uuid = b.findUUID(username)
+        const nickname = b.findDisplayName(uuid)
+        const message = parsePlain(json.extra[5])
+        b.emit('chat', {
+          json,
+          type: 'system',
+          uuid,
+          message,
+          nickname,
+          username
+        })
+      } else { // Generic system chat format
+        const parsed = parsePlain(json)
+        const split = parsed.split(': ')
+        const chatName = split.splice(0, 1)[0]
+        const chatNameSplit = chatName.split(' ')
+        const nickname = chatNameSplit[chatNameSplit.length - 1]
+        const username = b.findRealName(chatName)
+        const uuid = b.findUUID(username)
+        b.emit('chat', {
+          json,
+          type: 'system',
+          uuid,
+          message: split.join(': '),
+          nickname,
+          username
+        })
+      }
     })
 
     b._client.on('chat', (data) => { // Legacy chat for versions <1.19
@@ -142,7 +181,19 @@ module.exports = {
       let username
       let message
       let uuid
-      if (b.host.options.isVanilla && json.translate === 'chat.type.text') { // Servers without Extras chat
+      if (json.translate === '%s %s › %s') { // ChipmunkMod format
+        if (json.with && json.with[1] && json.with[2]) {
+          username = parsePlain(json.with[1])
+          uuid = b.findUUID(username)
+          nickname = b.findDisplayName(uuid)
+          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
+        username = parsePlain(json.extra[3])
+        uuid = b.findUUID(username)
+        nickname = b.findDisplayName(uuid)
+        message = parsePlain(json.extra[5])
+      } else if (b.host.options.isVanilla && json.translate === 'chat.type.text') { // Servers without Extras chat
         if (json.with && json.with.length >= 2) {
           message = parsePlain(json.with[1])
           username = parsePlain(json.with[0])

util/ConsoleCommand.js

@@ -1,6 +1,7 @@
 const index = require('../index.js')
 const parse = require('../util/chatparse_console.js')
 const settings = require('../settings.json')
+const version = require('../version.json')
 class ConsoleCommand {
   constructor (cmd, index2) {
     this.send = () => {}
@@ -20,7 +21,7 @@ class ConsoleCommand {
     this.verify = 3
     this.host = ''
     this.port = '3'
-    this.serverName = 'botvX Console'
+    this.serverName = `${version.botName} Console`
     this.lang = settings.defaultLang
     this.colors = settings.colors
   }

version.json

@@ -1,7 +1,7 @@
 {
     "botName": "owobot",
-    "botVersion": "10.0.0",
-    "botAuthor": "a5a06d596f15c7db",
+    "botVersion": "10.0.3",
+    "botAuthor": "SundanceNanshan",
     "isPreRelease": false,
-    "sourceURL": "https://code.chipmunk.land/7cc5c4f330d47060/botvX"
+    "sourceURL": "https://code.chipmunk.land/7cc5c4f330d47060/owobot"
 }