fix lint for new standard version

This commit is contained in:
Romain Beaumont 2019-08-03 23:29:14 +00:00
parent 9268d95571
commit 8e5264dc52
14 changed files with 107 additions and 106 deletions

View file

@ -5,28 +5,28 @@ const states = mc.states
const util = require('util')
const colors = {
'black': 'black+white_bg',
'dark_blue': 'blue',
'dark_green': 'green',
'dark_aqua': 'cyan',
'dark_red': 'red',
'dark_purple': 'magenta',
'gold': 'yellow',
'gray': 'black+white_bg',
'dark_gray': 'black+white_bg',
'blue': 'blue',
'green': 'green',
'aqua': 'cyan',
'red': 'red',
'light_purple': 'magenta',
'yellow': 'yellow',
'white': 'white',
'obfuscated': 'blink',
'bold': 'bold',
'strikethrough': '',
'underlined': 'underlined',
'italic': '',
'reset': 'white+black_bg'
black: 'black+white_bg',
dark_blue: 'blue',
dark_green: 'green',
dark_aqua: 'cyan',
dark_red: 'red',
dark_purple: 'magenta',
gold: 'yellow',
gray: 'black+white_bg',
dark_gray: 'black+white_bg',
blue: 'blue',
green: 'green',
aqua: 'cyan',
red: 'red',
light_purple: 'magenta',
yellow: 'yellow',
white: 'white',
obfuscated: 'blink',
bold: 'bold',
strikethrough: '',
underlined: 'underlined',
italic: '',
reset: 'white+black_bg'
}
const dictionary = {
@ -162,7 +162,7 @@ function parseChat (chatObj, parentState) {
if ('text' in chatObj) {
chat += color(chatObj.text, getColorize(parentState))
} else if ('translate' in chatObj && dictionary.hasOwnProperty(chatObj.translate)) {
} else if ('translate' in chatObj && dictionary[chatObj.translate] !== undefined) {
const args = [dictionary[chatObj.translate]]
chatObj['with'].forEach(function (s) {
args.push(parseChat(s, parentState))

View file

@ -6,45 +6,45 @@ if (process.argv.length < 4 || process.argv.length > 6) {
}
const customPackets = {
'1.8': {
'play': {
'toClient': {
'types': {
'packet_custom_name': [
1.8: {
play: {
toClient: {
types: {
packet_custom_name: [
'container', [
{
'name': 'age',
'type': 'i64'
name: 'age',
type: 'i64'
},
{
'name': 'time',
'type': 'i64'
name: 'time',
type: 'i64'
}
]
],
'packet': [
packet: [
'container',
[
{
'name': 'name',
'type': [
name: 'name',
type: [
'mapper',
{
'type': 'varint',
'mappings': {
type: 'varint',
mappings: {
'0x7A': 'custom_name'
}
}
]
},
{
'name': 'params',
'type': [
name: 'params',
type: [
'switch',
{
'compareTo': 'name',
'fields': {
'custom_name': 'packet_custom_name'
compareTo: 'name',
fields: {
custom_name: 'packet_custom_name'
}
}
]

View file

@ -54,17 +54,17 @@ server.on('listening', function () {
})
function broadcast (message, exclude, username) {
let client, translate
translate = username ? 'chat.type.announcement' : 'chat.type.text'
let client
const translate = username ? 'chat.type.announcement' : 'chat.type.text'
username = username || 'Server'
for (const clientId in server.clients) {
if (!server.clients.hasOwnProperty(clientId)) continue
if (server.clients[clientId] === undefined) continue
client = server.clients[clientId]
if (client !== exclude) {
const msg = {
translate: translate,
'with': [
with: [
username,
message
]

View file

@ -40,7 +40,7 @@ server.on('login', function (client) {
const msg = {
translate: 'chat.type.announcement',
'with': [
with: [
'Server',
'Hello, world!'
]

View file

@ -12,7 +12,7 @@
"prepublish": "require-self",
"test": "mocha --recursive --reporter spec",
"lint": "standard",
"fix": "standard fix",
"fix": "standard --fix",
"pretest": "npm run lint"
},
"keywords": [

View file

@ -20,7 +20,7 @@ module.exports = function (client, options) {
// The version string is interpreted by https://github.com/PrismarineJS/node-minecraft-data
const brandedMinecraftVersion = response.version.name // 1.8.9, 1.7.10
const protocolVersion = response.version.protocol// 47, 5
let versions = [brandedMinecraftVersion]
const versions = [brandedMinecraftVersion]
.concat(brandedMinecraftVersion.match(/((\d+\.)+\d+)/g) || [])
.map(function (version) {
return minecraftData.versionsByMinecraftVersion['pc'][version]

View file

@ -5,12 +5,12 @@ const UUID = require('uuid-1345')
const zlib = require('zlib')
module.exports = {
'UUID': [readUUID, writeUUID, 16],
'nbt': [readNbt, writeNbt, sizeOfNbt],
'optionalNbt': [readOptionalNbt, writeOptionalNbt, sizeOfOptionalNbt],
'compressedNbt': [readCompressedNbt, writeCompressedNbt, sizeOfCompressedNbt],
'restBuffer': [readRestBuffer, writeRestBuffer, sizeOfRestBuffer],
'entityMetadataLoop': [readEntityMetadata, writeEntityMetadata, sizeOfEntityMetadata]
UUID: [readUUID, writeUUID, 16],
nbt: [readNbt, writeNbt, sizeOfNbt],
optionalNbt: [readOptionalNbt, writeOptionalNbt, sizeOfOptionalNbt],
compressedNbt: [readCompressedNbt, writeCompressedNbt, sizeOfCompressedNbt],
restBuffer: [readRestBuffer, writeRestBuffer, sizeOfRestBuffer],
entityMetadataLoop: [readEntityMetadata, writeEntityMetadata, sizeOfEntityMetadata]
}
var PartialReadError = require('protodef').utils.PartialReadError

View file

@ -6,17 +6,17 @@ module.exports = function (client, server, { beforePing = null }) {
function onPing () {
const response = {
'version': {
'name': server.mcversion.minecraftVersion,
'protocol': server.mcversion.version
version: {
name: server.mcversion.minecraftVersion,
protocol: server.mcversion.version
},
'players': {
'max': server.maxPlayers,
'online': server.playerCount,
'sample': []
players: {
max: server.maxPlayers,
online: server.playerCount,
sample: []
},
'description': { 'text': server.motd },
'favicon': server.favicon
description: { text: server.motd },
favicon: server.favicon
}
function answerToPing (err, response) {

View file

@ -1,10 +1,10 @@
'use strict'
const states = {
'HANDSHAKING': 'handshaking',
'STATUS': 'status',
'LOGIN': 'login',
'PLAY': 'play'
HANDSHAKING: 'handshaking',
STATUS: 'status',
LOGIN: 'login',
PLAY: 'play'
}
module.exports = states

View file

@ -30,6 +30,7 @@ class Splitter extends Transform {
this.buffer = Buffer.alloc(0)
this.recognizeLegacyPing = false
}
_transform (chunk, enc, cb) {
this.buffer = Buffer.concat([this.buffer, chunk])

View file

@ -25,9 +25,9 @@ mc.supportedVersions.forEach(function (supportedVersion, i) {
const inputData = []
it('bench serializing', function (done) {
const serializer = mc.createSerializer({ state: states.PLAY, isServer: false, version: version.minecraftVersion })
let start, i, j
let i, j
console.log('Beginning write test')
start = Date.now()
const start = Date.now()
for (i = 0; i < ITERATIONS; i++) {
for (j = 0; j < testDataWrite.length; j++) {
inputData.push(serializer.createPacketBuffer(testDataWrite[j]))

View file

@ -47,7 +47,7 @@ mc.supportedVersions.forEach(function (supportedVersion, i) {
wrap.startServer({
'online-mode': 'false',
'server-port': PORT,
'motd': 'test1234',
motd: 'test1234',
'max-players': 120
}, function (err) {
if (err) { console.log(err) }

View file

@ -34,15 +34,15 @@ const slotValue = {
}
const values = {
'i32': 123456,
'i16': -123,
'u16': 123,
'varint': 1,
'i8': -10,
'u8': 8,
'string': 'hi hi this is my client string',
'buffer': Buffer.alloc(8),
'array': function (typeArgs, context) {
i32: 123456,
i16: -123,
u16: 123,
varint: 1,
i8: -10,
u8: 8,
string: 'hi hi this is my client string',
buffer: Buffer.alloc(8),
array: function (typeArgs, context) {
let count
if (typeof typeArgs.count === 'object') {
count = evalCount(typeArgs.count, context)
@ -58,7 +58,7 @@ const values = {
}
return arr
},
'container': function (typeArgs, context) {
container: function (typeArgs, context) {
const results = {
'..': context
}
@ -78,12 +78,12 @@ const values = {
delete context['..']
return results
},
'count': 1, // TODO : might want to set this to a correct value
'bool': true,
'f64': 99999.2222,
'f32': -333.444,
'slot': slotValue,
'nbt': {
count: 1, // TODO : might want to set this to a correct value
bool: true,
f64: 99999.2222,
f32: -333.444,
slot: slotValue,
nbt: {
type: 'compound',
name: 'test',
value: {
@ -96,7 +96,7 @@ const values = {
test7: { type: 'intArray', value: [12, 42] }
}
},
'optionalNbt': {
optionalNbt: {
type: 'compound',
name: 'test',
value: {
@ -109,7 +109,7 @@ const values = {
test7: { type: 'intArray', value: [12, 42] }
}
},
'compressedNbt': {
compressedNbt: {
type: 'compound',
name: 'test',
value: {
@ -122,24 +122,24 @@ const values = {
test7: { type: 'intArray', value: [12, 42] }
}
},
'i64': [0, 1],
'u64': [0, 1],
'entityMetadata': [
i64: [0, 1],
u64: [0, 1],
entityMetadata: [
{ key: 17, value: 0, type: 0 }
],
'objectData': {
objectData: {
intField: 9,
velocityX: 1,
velocityY: 2,
velocityZ: 3
},
'UUID': '00112233-4455-6677-8899-aabbccddeeff',
'position': { x: 12, y: 100, z: 4382821 },
'position_ibi': { x: 12, y: 100, z: 4382821 },
'position_isi': { x: 12, y: 100, z: 4382821 },
'position_iii': { x: 12, y: 100, z: 4382821 },
'restBuffer': Buffer.alloc(0),
'switch': function (typeArgs, context) {
UUID: '00112233-4455-6677-8899-aabbccddeeff',
position: { x: 12, y: 100, z: 4382821 },
position_ibi: { x: 12, y: 100, z: 4382821 },
position_isi: { x: 12, y: 100, z: 4382821 },
position_iii: { x: 12, y: 100, z: 4382821 },
restBuffer: Buffer.alloc(0),
switch: function (typeArgs, context) {
const i = typeArgs.fields[getField(typeArgs.compareTo, context)]
if (i === undefined) {
if (typeArgs.default === undefined) {
@ -149,10 +149,10 @@ const values = {
return getValue(typeArgs.default, context)
} else { return getValue(i, context) }
},
'option': function (typeArgs, context) {
option: function (typeArgs, context) {
return getValue(typeArgs, context)
},
'bitfield': function (typeArgs, context) {
bitfield: function (typeArgs, context) {
const results = {}
Object.keys(typeArgs).forEach(function (index) {
results[typeArgs[index].name] = 1
@ -160,9 +160,9 @@ const values = {
})
return results
},
'tags': [{ 'tagName': 'hi', 'entries': [1, 2, 3, 4, 5] }],
'ingredient': [slotValue],
'particleData': null
tags: [{ tagName: 'hi', entries: [1, 2, 3, 4, 5] }],
ingredient: [slotValue],
particleData: null
}
function getValue (_type, packet) {

View file

@ -207,7 +207,7 @@ mc.supportedVersions.forEach(function (supportedVersion, i) {
function broadcast (message, exclude) {
let client
for (const clientId in server.clients) {
if (!server.clients.hasOwnProperty(clientId)) continue
if (server.clients[clientId] === undefined) continue
client = server.clients[clientId]
if (client !== exclude) client.write('chat', { message: JSON.stringify({ text: message }), position: 0 })