prismarine-chat 1.3.2 → 1.5.0

package/HISTORY.md

@@ -1,5 +1,21 @@
 ## History
 
+### 1.5.0
+
+* allow ChatMessage constructor to accept strings with legacy color codes (§) be converted to new json
+
+### 1.4.1
+* Remake ChatMessage#clone (@u9g)
+
+### 1.4.0
+* Add a example (@u9g)
+* Add hex color code support (@U5B)
+* use rest arg to allow many withs or extras (@u9g)
+* Add missing json attribute to typescript defintions (@Paulomart & @u9g)
+
+### 1.3.3
+* fix typings
+
 ### 1.3.2
 * Properly export loader function and export ChatMessage & MessageBuilder as types
 

package/MessageBuilder.js

@@ -144,16 +144,29 @@ function loader (version) {
     /**
      * appended to the end of this message object with the existing formatting.
      * formatting can be overrode in child messagebuilder
-     * @param {MessageBuilder|string} val
+     * @param {Array<MessageBuilder | string>} ...args
      * @returns
      */
-    addExtra (val) { this.extra.push(typeof val === 'string' ? val : val.toJSON()); return this }
+    addExtra (...args) {
+      for (const v of args) {
+        const value = typeof v === 'string' ? v : v.toJSON()
+        this.extra.push(value)
+      }
+      return this
+    }
+
     /**
      * requires .translate to be set for this to be used
-     * @param {MessageBuilder|string} val
+     * @param {Array<MessageBuilder | string>} ...args
      * @returns
      */
-    addWith (val) { this.with.push(typeof val === 'string' ? val : val.toJSON()); return this }
+    addWith (...args) {
+      for (const v of args) {
+        const value = typeof v === 'string' ? v : v.toJSON()
+        this.with.push(value)
+      }
+      return this
+    }
 
     resetFormatting () {
       this.setBold(false)

package/README.md

@@ -90,8 +90,8 @@ Returns a prismarine-chat representation of the message recieved from the 'chat'
 #### setScore (name: string, objective: string) : this
 #### setClickEvent (action: string, value: object) : this
 #### setHoverEvent (action: string, data: object, type?: 'contents'|'value') : this
-#### addExtra (val: MessageBuilder | string) : this
-#### addWith (val: MessageBuilder | string) : this
+#### addExtra (...val: MessageBuilder | string) : this
+#### addWith (...val: MessageBuilder | string) : this
 #### resetFormatting () : void
 sets every one of the formatting options to false and sets text to `reset` type
 

package/index.d.ts

@@ -1,11 +1,8 @@
 declare const loader: (mcVersion: string) => typeof ChatMessage
 
-export = loader
+export default loader
 
-export type ChatMessage = ChatMessage
-export type MessageBuilder = MessageBuilder
-
-declare class ChatMessage {
+export declare class ChatMessage {
   // for export
   static MessageBuilder: typeof MessageBuilder
 
@@ -17,6 +14,8 @@ declare class ChatMessage {
     displayWarning?: boolean
   )
 
+  public readonly json: any
+
   /**
    * Append one or more ChatMessages
    */
@@ -26,6 +25,13 @@ declare class ChatMessage {
    * Returns a clone of the ChatMessage
    */
   clone(): ChatMessage
+  
+  /**
+   * Optional info with no guarantee for form or shape.
+   */
+  extra?: Array<ChatMessage>
+
+  translate?: string
 
   /**
    * Flattens the message into plain-text, without style.
@@ -66,7 +72,7 @@ declare class ChatMessage {
 
 type Language = { [key: string]: string }
 
-declare class MessageBuilder {
+export declare class MessageBuilder {
   with: string[]
   extra: string[]
   bold?: boolean
@@ -167,19 +173,21 @@ declare class MessageBuilder {
    * appended to the end of this message object with the existing formatting.
    * formatting can be overridden in child messagebuilder
    */
-  addExtra(val: MessageBuilder | string): this
+  addExtra(...args: Array<MessageBuilder | string>): this
 
   /**
    * requires .translate to be set for this to be used
    */
-  addWith(val: MessageBuilder | string): this
+  addWith(...args: Array<MessageBuilder | string>): this
 
   resetFormatting(): void
 
   toJSON(): object
 
   toString(): string
-
+  /**
+   * fromString('&aHello').toJSON() => { text: 'Hello', color: 'aqua' }
+   */
   static fromString(
     str: string,
     args?: { colorSeparator?: string }

package/index.js

@@ -5,361 +5,378 @@ module.exports = loader
 
 function loader (mcVersion) {
   const mcData = require('minecraft-data')(mcVersion)
-  defaultLang = mcData.language
+  const defaultLang = mcData.language
   const { MessageBuilder } = require('./MessageBuilder')(mcVersion)
-  ChatMessage.MessageBuilder = MessageBuilder
-  return ChatMessage
-}
-
-let defaultLang
-
-/**
- * ChatMessage Constructor
- * @param {String|Object|Number} message content of ChatMessage
- */
-class ChatMessage {
-  constructor (message, displayWarning = false) {
-    if (typeof message === 'string' || typeof message === 'number') {
-      this.json = { text: message }
-    } else if (typeof message === 'object' && !Array.isArray(message)) {
-      this.json = message
-    } else if (typeof message === 'object') {
-      this.json = { extra: message }
-    } else {
-      throw new Error('Expected String or Object for Message argument')
-    }
-    this.parse(displayWarning)
-  }
 
   /**
-   * Parses the this.json property to decorate the properties of the ChatMessage.
-   * Called by the Constructor
-   * @return {void}
+   * ChatMessage Constructor
+   * @param {String|Object|Number} message content of ChatMessage
    */
-  parse (displayWarning = false) {
-    const json = this.json
-    // Message scope for callback functions
-    // There is EITHER, a text property or a translate property
-    // If there is no translate property, there is no with property
-    // HOWEVER! If there is a translate property, there may not be a with property
-    if (typeof json.text === 'string' || typeof json.text === 'number') {
-      this.text = json.text
-    } else if (typeof json.translate === 'string') {
-      this.translate = json.translate
-      if (typeof json.with === 'object') {
-        if (!Array.isArray(json.with)) {
-          throw new Error('Expected with property to be an Array in ChatMessage')
+  class ChatMessage {
+    constructor (message, displayWarning = false) {
+      if (typeof message === 'string') {
+        if (message === '') {
+          this.json = { text: '' }
+        } else {
+          this.json = MessageBuilder.fromString(message, { colorSeparator: '§' })
         }
-        this.with = json.with.map(entry => new ChatMessage(entry))
-      }
-    }
-    // Parse extra property
-    // Extras are appended to the initial text
-    if (typeof json.extra === 'object') {
-      if (!Array.isArray(json.extra)) {
-        throw new Error('Expected extra property to be an Array in ChatMessage')
+      } else if (typeof message === 'number') {
+        this.json = { text: message }
+      } else if (typeof message === 'object' && Array.isArray(message)) {
+        this.json = { extra: message }
+      } else if (typeof message === 'object') {
+        this.json = message
+      } else {
+        throw new Error('Expected String or Object for Message argument')
       }
-      this.extra = json.extra.map(entry => new ChatMessage(entry))
+      this.parse(displayWarning)
     }
-    // Text modifiers
-    this.bold = json.bold
-    this.italic = json.italic
-    this.underlined = json.underlined
-    this.strikethrough = json.strikethrough
-    this.obfuscated = json.obfuscated
 
-    // Supported constants @ 2014-04-21
-    const supportedColors = [
-      'black',
-      'dark_blue',
-      'dark_green',
-      'dark_aqua',
-      'dark_red',
-      'dark_purple',
-      'gold',
-      'gray',
-      'dark_gray',
-      'blue',
-      'green',
-      'aqua',
-      'red',
-      'light_purple',
-      'yellow',
-      'white',
-      'obfuscated',
-      'bold',
-      'strikethrough',
-      'underlined',
-      'italic',
-      'reset'
-    ]
-    const supportedClick = [
-      'open_url',
-      'open_file',
-      'run_command',
-      'suggest_command'
-    ]
-    const supportedHover = [
-      'show_text',
-      'show_achievement',
-      'show_item',
-      'show_entity'
-    ]
+    /**
+     * Parses the this.json property to decorate the properties of the ChatMessage.
+     * Called by the Constructor
+     * @return {void}
+     */
+    parse (displayWarning = false) {
+      const json = this.json
+      // Message scope for callback functions
+      // There is EITHER, a text property or a translate property
+      // If there is no translate property, there is no with property
+      // HOWEVER! If there is a translate property, there may not be a with property
+      if (typeof json.text === 'string' || typeof json.text === 'number') {
+        this.text = json.text
+      } else if (typeof json.translate === 'string') {
+        this.translate = json.translate
+        if (typeof json.with === 'object') {
+          if (!Array.isArray(json.with)) {
+            throw new Error('Expected with property to be an Array in ChatMessage')
+          }
+          this.with = json.with.map(entry => new ChatMessage(entry))
+        }
+      }
+      // Parse extra property
+      // Extras are appended to the initial text
+      if (typeof json.extra === 'object') {
+        if (!Array.isArray(json.extra)) {
+          throw new Error('Expected extra property to be an Array in ChatMessage')
+        }
+        this.extra = json.extra.map(entry => new ChatMessage(entry))
+      }
+      // Text modifiers
+      this.bold = json.bold
+      this.italic = json.italic
+      this.underlined = json.underlined
+      this.strikethrough = json.strikethrough
+      this.obfuscated = json.obfuscated
 
-    // Parse color
-    this.color = json.color
-    switch (this.color) {
-      case 'obfuscated':
-        this.obfuscated = true
-        this.color = null
-        break
-      case 'bold':
-        this.bold = true
-        this.color = null
-        break
-      case 'strikethrough':
-        this.strikethrough = true
-        this.color = null
-        break
-      case 'underlined':
-        this.underlined = true
-        this.color = null
-        break
-      case 'italic':
-        this.italic = true
-        this.color = null
-        break
-      case 'reset':
-        this.reset = true
-        this.color = null
-        break
-    }
-    if (Array.prototype.indexOf && this.color &&
-      supportedColors.indexOf(this.color) === -1 && displayWarning) {
-      console.warn('ChatMessage parsed with unsupported color', this.color)
-    }
+      // Supported constants @ 2014-04-21
+      const supportedColors = [
+        'black',
+        'dark_blue',
+        'dark_green',
+        'dark_aqua',
+        'dark_red',
+        'dark_purple',
+        'gold',
+        'gray',
+        'dark_gray',
+        'blue',
+        'green',
+        'aqua',
+        'red',
+        'light_purple',
+        'yellow',
+        'white',
+        'obfuscated',
+        'bold',
+        'strikethrough',
+        'underlined',
+        'italic',
+        'reset'
+      ]
+      const supportedClick = [
+        'open_url',
+        'open_file',
+        'run_command',
+        'suggest_command'
+      ]
+      const supportedHover = [
+        'show_text',
+        'show_achievement',
+        'show_item',
+        'show_entity'
+      ]
 
-    // Parse click event
-    if (typeof json.clickEvent === 'object') {
-      this.clickEvent = json.clickEvent
-      if (typeof this.clickEvent.action !== 'string') {
-        throw new Error('ClickEvent action missing in ChatMessage')
-      } else if (Array.prototype.indexOf && supportedClick.indexOf(this.clickEvent.action) === -1 && displayWarning) {
-        console.warn('ChatMessage parsed with unsupported clickEvent', this.clickEvent.action)
+      // Parse color
+      this.color = json.color
+      switch (this.color) {
+        case 'obfuscated':
+          this.obfuscated = true
+          this.color = null
+          break
+        case 'bold':
+          this.bold = true
+          this.color = null
+          break
+        case 'strikethrough':
+          this.strikethrough = true
+          this.color = null
+          break
+        case 'underlined':
+          this.underlined = true
+          this.color = null
+          break
+        case 'italic':
+          this.italic = true
+          this.color = null
+          break
+        case 'reset':
+          this.reset = true
+          this.color = null
+          break
+      }
+      // Make sure color is valid
+      if (Array.prototype.indexOf && this.color &&
+        supportedColors.indexOf(this.color) === -1 &&
+        !this.color.match(/#[a-fA-F\d]{6}/) && displayWarning) {
+        console.warn('ChatMessage parsed with unsupported color', this.color)
       }
-    }
 
-    // Parse hover event
-    if (typeof json.hoverEvent === 'object') {
-      this.hoverEvent = json.hoverEvent
-      if (typeof this.hoverEvent.action !== 'string') {
-        throw new Error('HoverEvent action missing in ChatMessage')
-      } else if (Array.prototype.indexOf && supportedHover.indexOf(this.hoverEvent.action) === -1 && displayWarning) {
-        console.warn('ChatMessage parsed with unsupported hoverEvent', this.hoverEvent.action)
+      // Parse click event
+      if (typeof json.clickEvent === 'object') {
+        this.clickEvent = json.clickEvent
+        if (typeof this.clickEvent.action !== 'string') {
+          throw new Error('ClickEvent action missing in ChatMessage')
+        } else if (Array.prototype.indexOf && supportedClick.indexOf(this.clickEvent.action) === -1 && displayWarning) {
+          console.warn('ChatMessage parsed with unsupported clickEvent', this.clickEvent.action)
+        }
       }
-      // Special case
-      if (this.hoverEvent.action === 'show_item') {
-        let content
-        if (this.hoverEvent.value instanceof Array) {
-          if (this.hoverEvent.value[0] instanceof Object) {
-            content = this.hoverEvent.value[0].text
-          } else {
-            content = this.hoverEvent.value[0]
-          }
-        } else {
-          if (this.hoverEvent.value instanceof Object) {
-            content = this.hoverEvent.value.text
+
+      // Parse hover event
+      if (typeof json.hoverEvent === 'object') {
+        this.hoverEvent = json.hoverEvent
+        if (typeof this.hoverEvent.action !== 'string') {
+          throw new Error('HoverEvent action missing in ChatMessage')
+        } else if (Array.prototype.indexOf && supportedHover.indexOf(this.hoverEvent.action) === -1 && displayWarning) {
+          console.warn('ChatMessage parsed with unsupported hoverEvent', this.hoverEvent.action)
+        }
+        // Special case
+        if (this.hoverEvent.action === 'show_item') {
+          let content
+          if (this.hoverEvent.value instanceof Array) {
+            if (this.hoverEvent.value[0] instanceof Object) {
+              content = this.hoverEvent.value[0].text
+            } else {
+              content = this.hoverEvent.value[0]
+            }
           } else {
-            content = this.hoverEvent.value
+            if (this.hoverEvent.value instanceof Object) {
+              content = this.hoverEvent.value.text
+            } else {
+              content = this.hoverEvent.value
+            }
           }
-        }
-        try {
-          this.hoverEvent.value = mojangson.parse(content)
-        } catch (err) {
+          try {
+            this.hoverEvent.value = mojangson.parse(content)
+          } catch (err) {
 
+          }
         }
       }
     }
-  }
-
-  /**
-   * Append one or more ChatMessages
-   * @param {...object|string} messages ChatMessage
-   * @return {void}
-   */
-  append (...messages) {
-    if (this.extra === undefined) this.extra = []
-    messages.forEach((message) => {
-      if (typeof message === 'object' && !Array.isArray(message)) {
-        this.extra.push(message)
-      } else if (typeof message === 'string') {
-        this.extra.push(new ChatMessage(message))
-      }
-    })
-  }
 
-  /**
-  * Returns a clone of the ChatMessage
-  * @return {ChatMessage}
-   */
-  clone () {
-    return Object.assign(
-      Object.create(
-        Object.getPrototypeOf(this)
-      ),
-      this
-    )
-  }
+    /**
+     * Append one or more ChatMessages
+     * @param {...object|string} messages ChatMessage
+     * @return {void}
+     */
+    append (...messages) {
+      if (this.extra === undefined) this.extra = []
+      messages.forEach((message) => {
+        if (typeof message === 'object' && !Array.isArray(message)) {
+          this.extra.push(message)
+        } else if (typeof message === 'string') {
+          this.extra.push(new ChatMessage(message))
+        }
+      })
+    }
 
-  /**
-   * Returns the count of text extras and child ChatMessages
-   * Does not count recursively in to the children
-   * @return {Number}
-   */
-  length () {
-    let count = 0
-    if (this.text) count++
-    else if (this.with) count += this.with.length
+    /**
+    * Returns a clone of the ChatMessage
+    * @return {ChatMessage}
+    */
+    clone () {
+      return new ChatMessage(JSON.parse(JSON.stringify(this.json)))
+    }
 
-    if (this.extra) count += this.extra.length
-    return count
-  }
+    /**
+     * Returns the count of text extras and child ChatMessages
+     * Does not count recursively in to the children
+     * @return {Number}
+     */
+    length () {
+      let count = 0
+      if (this.text) count++
+      else if (this.with) count += this.with.length
 
-  /**
-   * Returns a text part from the message
-   * @param  {Number} idx Index of the part
-   * @return {String}
-   */
-  getText (idx, lang = defaultLang) {
-    // If the index is not defined is is invalid, return toString
-    if (typeof idx !== 'number') return this.toString(lang)
-    // If we are not a translating message, return the text
-    if (this.text && idx === 0) return this.text.replace(/§[0-9a-flnmokr]/g, '')
-    // Else return the with child if it's in range
-    else if (this.with.length > idx) return this.with[idx].toString(lang)
-    // Else return the extra if it's in range
-    if (this.extra && this.extra.length + (this.text ? 1 : this.with.length) > idx) {
-      return this.extra[idx - (this.text ? 1 : this.with.length)].toString(lang)
+      if (this.extra) count += this.extra.length
+      return count
     }
-    // Not sure how you want to default this
-    // Undefined, an error ?
-    return ''
-  }
 
-  /**
-   * Flattens the message in to plain-text
-   * @return {String}
-   */
-  toString (lang = defaultLang) {
-    let message = ''
-    if (typeof this.text === 'string' || typeof this.text === 'number') message += this.text
-    else if (this.with) {
-      const args = this.with.map(entry => entry.toString(lang))
-      const format = lang[this.translate]
-      if (!format) message += args.join('')
-      else message += vsprintf(format, args)
-    } else if (this.translate) {
-      message += lang[this.translate]
-    }
-    if (this.extra) {
-      message += this.extra.map((entry) => entry.toString(lang)).join('')
+    /**
+     * Returns a text part from the message
+     * @param  {Number} idx Index of the part
+     * @return {String}
+     */
+    getText (idx, lang = defaultLang) {
+      // If the index is not defined is is invalid, return toString
+      if (typeof idx !== 'number') return this.toString(lang)
+      // If we are not a translating message, return the text
+      if (this.text && idx === 0) return this.text.replace(/§[0-9a-flnmokr]/g, '')
+      // Else return the with child if it's in range
+      else if (this.with.length > idx) return this.with[idx].toString(lang)
+      // Else return the extra if it's in range
+      if (this.extra && this.extra.length + (this.text ? 1 : this.with.length) > idx) {
+        return this.extra[idx - (this.text ? 1 : this.with.length)].toString(lang)
+      }
+      // Not sure how you want to default this
+      // Undefined, an error ?
+      return ''
     }
-    return message.replace(/§[0-9a-flnmokr]/g, '')
-  }
 
-  valueOf () {
-    return this.toString()
-  }
+    /**
+     * Flattens the message in to plain-text
+     * @return {String}
+     */
+    toString (lang = defaultLang) {
+      let message = ''
+      if (typeof this.text === 'string' || typeof this.text === 'number') message += this.text
+      else if (this.with) {
+        const args = this.with.map(entry => entry.toString(lang))
+        const format = lang[this.translate]
+        if (!format) message += args.join('')
+        else message += vsprintf(format, args)
+      } else if (this.translate) {
+        message += lang[this.translate]
+      }
+      if (this.extra) {
+        message += this.extra.map((entry) => entry.toString(lang)).join('')
+      }
+      return message.replace(/§[0-9a-flnmokr]/g, '')
+    }
 
-  toMotd (lang = defaultLang, parent = {}) {
-    const codes = {
-      color: {
-        black: '§0',
-        dark_blue: '§1',
-        dark_green: '§2',
-        dark_aqua: '§3',
-        dark_red: '§4',
-        dark_purple: '§5',
-        gold: '§6',
-        gray: '§7',
-        dark_gray: '§8',
-        blue: '§9',
-        green: '§a',
-        aqua: '§b',
-        red: '§c',
-        light_purple: '§d',
-        yellow: '§e',
-        white: '§f'
-      },
-      bold: '§l',
-      italic: '§o',
-      underlined: '§n',
-      strikethrough: '§m',
-      obfuscated: '§k'
+    valueOf () {
+      return this.toString()
     }
 
-    let message = Object.keys(codes).map((code) => {
-      this[code] = this[code] || parent[code]
-      if (!this[code] || this[code] === 'false') return null
-      if (code === 'color') return codes.color[this.color]
-      return codes[code]
-    }).join('')
+    toMotd (lang = defaultLang, parent = {}) {
+      const codes = {
+        color: {
+          black: '§0',
+          dark_blue: '§1',
+          dark_green: '§2',
+          dark_aqua: '§3',
+          dark_red: '§4',
+          dark_purple: '§5',
+          gold: '§6',
+          gray: '§7',
+          dark_gray: '§8',
+          blue: '§9',
+          green: '§a',
+          aqua: '§b',
+          red: '§c',
+          light_purple: '§d',
+          yellow: '§e',
+          white: '§f'
+        },
+        bold: '§l',
+        italic: '§o',
+        underlined: '§n',
+        strikethrough: '§m',
+        obfuscated: '§k'
+      }
 
-    if (typeof this.text === 'string' || typeof this.text === 'number') message += `${this.text}§r`
-    else if (this.with) {
-      const args = this.with.map(entry => entry.toMotd(lang))
-      const format = lang[this.translate]
-      if (!format) message += args.join('')
-      else message += vsprintf(format, args)
-    } else if (this.translate) {
-      message += lang[this.translate]
-    }
-    if (this.extra) {
-      message += this.extra.map(entry => entry.toMotd(lang, this)).join('')
-    }
-    return message
-  }
+      let message = Object.keys(codes).map((code) => {
+        this[code] = this[code] || parent[code]
+        if (!this[code] || this[code] === 'false') return null
+        if (code === 'color') {
+          // return hex codes in this format
+          if (this.color.startsWith('#')) return `§${this.color}`
+          return codes.color[this.color]
+        }
+        return codes[code]
+      }).join('')
 
-  toAnsi (lang = defaultLang) {
-    const codes = {
-      '§0': '\u001b[30m',
-      '§1': '\u001b[34m',
-      '§2': '\u001b[32m',
-      '§3': '\u001b[36m',
-      '§4': '\u001b[31m',
-      '§5': '\u001b[35m',
-      '§6': '\u001b[33m',
-      '§7': '\u001b[37m',
-      '§8': '\u001b[90m',
-      '§9': '\u001b[94m',
-      '§a': '\u001b[92m',
-      '§b': '\u001b[96m',
-      '§c': '\u001b[91m',
-      '§d': '\u001b[95m',
-      '§e': '\u001b[93m',
-      '§f': '\u001b[97m',
-      '§l': '\u001b[1m',
-      '§o': '\u001b[3m',
-      '§n': '\u001b[4m',
-      '§m': '\u001b[9m',
-      '§k': '\u001b[6m',
-      '§r': '\u001b[0m'
+      if (typeof this.text === 'string' || typeof this.text === 'number') message += `${this.text}§r`
+      else if (this.with) {
+        const args = this.with.map(entry => entry.toMotd(lang))
+        const format = lang[this.translate]
+        if (!format) message += args.join('')
+        else message += vsprintf(format, args)
+      } else if (this.translate) {
+        message += lang[this.translate]
+      }
+      if (this.extra) {
+        message += this.extra.map(entry => entry.toMotd(lang, this)).join('')
+      }
+      return message
     }
 
-    let message = this.toMotd(lang)
-    for (const k in codes) {
-      message = message.replace(new RegExp(k, 'g'), codes[k])
+    toAnsi (lang = defaultLang) {
+      const codes = {
+        '§0': '\u001b[30m',
+        '§1': '\u001b[34m',
+        '§2': '\u001b[32m',
+        '§3': '\u001b[36m',
+        '§4': '\u001b[31m',
+        '§5': '\u001b[35m',
+        '§6': '\u001b[33m',
+        '§7': '\u001b[37m',
+        '§8': '\u001b[90m',
+        '§9': '\u001b[94m',
+        '§a': '\u001b[92m',
+        '§b': '\u001b[96m',
+        '§c': '\u001b[91m',
+        '§d': '\u001b[95m',
+        '§e': '\u001b[93m',
+        '§f': '\u001b[97m',
+        '§l': '\u001b[1m',
+        '§o': '\u001b[3m',
+        '§n': '\u001b[4m',
+        '§m': '\u001b[9m',
+        '§k': '\u001b[6m',
+        '§r': '\u001b[0m'
+      }
+
+      let message = this.toMotd(lang)
+      for (const k in codes) {
+        message = message.replace(new RegExp(k, 'g'), codes[k])
+      }
+      const hexRegex = /§#?([a-fA-F\d]{2})([a-fA-F\d]{2})([a-fA-F\d]{2})/
+      while (message.search(hexRegex) !== -1) {
+        // Stolen from https://stackoverflow.com/questions/5623838/rgb-to-hex-and-hex-to-rgb
+        const hexCodes = hexRegex.exec(message)
+        // Iterate over each hexColorCode match (§#69420, §#ABCDEF, §#A1B2C3)
+        const red = parseInt(hexCodes[1], 16)
+        const green = parseInt(hexCodes[2], 16)
+        const blue = parseInt(hexCodes[3], 16)
+        // ANSI from https://gist.github.com/fnky/458719343aabd01cfb17a3a4f7296797#rgb-colors
+        message = message.replace(hexRegex, `\u001b[38;2;${red};${green};${blue}m`)
+      }
+      return message + '\u001b[0m'
     }
-    return message + '\u001b[0m'
-  }
 
-  static fromNotch (msg) {
-    let toRet
-    try {
-      toRet = new ChatMessage(JSON.parse(msg))
-    } catch (e) {
-      toRet = new ChatMessage(msg)
+    static fromNotch (msg) {
+      let toRet
+      try {
+        toRet = new ChatMessage(JSON.parse(msg))
+      } catch (e) {
+        toRet = new ChatMessage(msg)
+      }
+      return toRet
     }
-    return toRet
   }
+
+  ChatMessage.MessageBuilder = MessageBuilder
+  return ChatMessage
 }

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "prismarine-chat",
-  "version": "1.3.2",
+  "version": "1.5.0",
   "description": "Wrapper for a minecraft chat message",
   "main": "index.js",
   "scripts": {
-    "test": "jest --verbose",
+    "test": "mocha --reporter spec --exit",
     "pretest": "npm run lint",
     "lint": "standard",
     "fix": "standard --fix"
@@ -24,7 +24,8 @@
   },
   "homepage": "https://github.com/PrismarineJS/prismarine-chat#readme",
   "devDependencies": {
-    "jest": "^27.0.4",
+    "expect": "^27.3.1",
+    "mocha": "^9.1.3",
     "prismarine-chat": "file:.",
     "standard": "^16.0.1"
   },
@@ -32,7 +33,7 @@
     "minecraft-data": "^2.62.1",
     "mojangson": "^2.0.1",
     "prismarine-item": "^1.10.0",
-    "prismarine-nbt": "^1.6.0",
+    "prismarine-nbt": "^2.0.0",
     "sprintf-js": "^1.1.2"
   }
 }

package/test/basic.test.js

@@ -1,10 +1,13 @@
-/* eslint-env jest */
+/* eslint-env mocha */
+
 const ChatMessage = require('prismarine-chat')('1.16')
-test('Parsing a chat message', () => {
+const expect = require('expect')
+
+it('Parsing a chat message', () => {
   const msg = new ChatMessage({ text: 'Example chat message' })
   expect(msg.toString()).toBe('Example chat message')
 })
-test('Parsing message that uses language file & numbers', () => {
+it('Parsing message that uses language file & numbers', () => {
   const msg = new ChatMessage({ italic: true, color: 'gray', translate: 'chat.type.admin', with: [{ insertion: 'ripwhitescrolls', clickEvent: { action: 'suggest_command', value: '/tell ripwhitescrolls ' }, hoverEvent: { action: 'show_entity', contents: { type: 'minecraft:player', id: '9d9e9257-b812-4332-8426-5e9a0d707392', name: { text: 'ripwhitescrolls' } } }, text: 'ripwhitescrolls' }, { translate: 'commands.clear.success.multiple', with: [256, 2] }] })
   // test as a string
   expect(msg.toString()).toBe('[ripwhitescrolls: Removed 256 items from 2 players]')
@@ -17,7 +20,17 @@ test('Parsing message that uses language file & numbers', () => {
   expect(msg.with[1].with[0].text).toBe(256)
   expect(msg.with[1].with[1].text).toBe(2)
 })
-test('Parsing a chat message which is an array', () => {
+it('Parsing a chat message which is an array', () => {
   const msg = new ChatMessage([{ text: 'Example chat ' }, { text: 'message' }])
   expect(msg.toString()).toBe('Example chat message')
 })
+it('Chat Message with a single hex color', () => {
+  const msg = new ChatMessage({ text: 'uwu', color: '#FF0000' })
+  expect(msg.toMotd()).toBe('§#FF0000uwu§r')
+  expect(msg.toAnsi()).toBe('\u001B[38;2;255;0;0muwu\u001B[0m\u001B[0m')
+})
+it('Chat Message with multiple hex colors', () => {
+  const msg = new ChatMessage(['', { text: 'uwu ', color: '#FF0000' }, { text: 'owo ', color: '#0000FF' }, { text: 'uwu', color: '#FF0000' }])
+  expect(msg.toMotd()).toBe('§r§#FF0000uwu §r§#0000FFowo §r§#FF0000uwu§r')
+  expect(msg.toAnsi()).toBe('\u001B[0m\u001B[38;2;255;0;0muwu \u001B[0m\u001B[38;2;0;0;255mowo \u001B[0m\u001B[38;2;255;0;0muwu\u001B[0m\u001B[0m')
+})

package/test/messagebuilder.test.js

@@ -1,4 +1,6 @@
-/* eslint-env jest */
+/* eslint-env mocha */
+
+const expect = require('expect')
 
 describe('MessageBuilder', () => {
   describe('1.16.5', () => {
@@ -18,7 +20,7 @@ describe('MessageBuilder', () => {
         ['Insertion', "Hi I'm inserted!"]
       ]
       for (const [prop, val] of properties) {
-        test(`builder#set${prop}`, () => { // ex: builder#setBold
+        it(`builder#set${prop}`, () => { // ex: builder#setBold
           const msg = new MessageBuilder()[`set${prop}`](val) // ex: .setBold(true)
           const json = msg.toJSON() // ex: { bold: true}
           const propName = prop.toLowerCase() // ex: 'bold'
@@ -28,13 +30,13 @@ describe('MessageBuilder', () => {
     })
 
     describe('with/extra', () => {
-      test('no translate w/ .with', () => {
+      it('no translate w/ .with', () => {
         const msg = new MessageBuilder()
           .addWith('Hello,')
           .addWith('World.')
         expect(msg.toJSON()).toStrictEqual({})
       })
-      test('translate w/ .with', () => {
+      it('translate w/ .with', () => {
         const msg = new MessageBuilder()
           .setTranslate('chat.type.text')
           .addWith(new MessageBuilder().setText('U9G'))
@@ -46,7 +48,7 @@ describe('MessageBuilder', () => {
         expect(text).toStrictEqual('<U9G> Hello world')
       })
 
-      test('w/ .addExtra add split hello & world', () => {
+      it('w/ .addExtra add split hello & world', () => {
         const msg = new MessageBuilder()
           .addExtra(new MessageBuilder().setText('Hello'))
           .addExtra(new MessageBuilder().setText(' ').setColor('reset'))