Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
"debug": "^4.3.2",
"endian-toggle": "^0.0.0",
"lodash.merge": "^4.3.0",
"minecraft-data": "^3.78.0",
"minecraft-data": "^3.101.0",
"minecraft-folder-path": "^1.2.0",
"node-fetch": "^2.6.1",
"node-rsa": "^0.4.2",
Expand Down
30 changes: 20 additions & 10 deletions test/clientTest.js
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ for (const supportedVersion of mc.supportedVersions) {
const message = JSON.parse(data.formattedMessage)
if (chatCount === 1) {
assert.strictEqual(message.translate, 'chat.type.text')
assert.deepEqual(message.with[0].clickEvent, {
assert.deepEqual(message.with[0][CLICK_EVENT], {
action: 'suggest_command',
value: mcData.version.version > 340 ? '/tell Player ' : '/msg Player '
})
Expand All @@ -194,20 +194,30 @@ for (const supportedVersion of mc.supportedVersions) {
}
} else {
// 1.19+
const sender = JSON.parse(data.senderName)
const msgPayload = data.formattedMessage ? JSON.parse(data.formattedMessage) : data.plainMessage
const plainMessage = client.parseMessage(msgPayload).toString()
const plainMessage = data.formattedMessage ? client.parseMessage(JSON.parse(data.formattedMessage)).toString() : data.plainMessage

if (chatCount === 1) {
assert.strictEqual(plainMessage, 'hello everyone; I have logged in.')
const clickEvent = sender[CLICK_EVENT]
assert.strictEqual(clickEvent.action, 'suggest_command')
assert.ok(['/tell Player ', '/msg Player '].includes(clickEvent.value || clickEvent.command))
assert.strictEqual(sender.text, 'Player')
// In 1.21+, senderName can be null when networkName is empty (NBT type: end)
if (data.senderName) {
const sender = JSON.parse(data.senderName)
if (sender) { // ADD THIS CHECK
const clickEvent = sender[CLICK_EVENT]
if (clickEvent) { // AND THIS ONE
assert.strictEqual(clickEvent.action, 'suggest_command')
assert.ok(['/tell Player ', '/msg Player '].includes(clickEvent.value || clickEvent.command))
assert.strictEqual(sender.text, 'Player')
}
}
}
} else if (chatCount === 2) {
const plainSender = client.parseMessage(sender).toString()
// In 1.21+, senderName can be null
if (data.senderName) {
const sender = JSON.parse(data.senderName)
const plainSender = client.parseMessage(sender).toString()
assert.strictEqual(plainSender, 'Server')
}
assert.strictEqual(plainMessage, 'hello')
assert.strictEqual(plainSender, 'Server')
wrap.removeListener('line', lineListener)
client.end()
done()
Expand Down