From 423beaf29c0d675d70de857c4f29ce43b114faa7 Mon Sep 17 00:00:00 2001 From: AlexKvazos Date: Thu, 30 Apr 2015 18:33:15 -0500 Subject: [PATCH] Updated readme screenshot --- README.md | 2 +- app/server/bot/events/end.js | 4 ++-- app/server/bot/events/login.js | 4 ++-- app/server/bot/events/message.js | 6 +++--- app/server/bot/events/spawn.js | 4 ++-- app/server/bot/index.js | 2 +- app/server/index.js | 8 +++----- app/server/parsers/extra.js | 4 ++-- app/server/parsers/vanilla.js | 2 +- app/server/sockets/events/chat.js | 4 ++-- app/server/sockets/events/connection.js | 6 +++--- app/server/sockets/events/disconnection.js | 6 +++--- app/server/sockets/events/players.js | 4 ++-- app/server/sockets/index.js | 4 ++-- app/server/utils/escapeHtml.js | 2 +- app/server/utils/stringToCode.js | 2 +- 16 files changed, 31 insertions(+), 33 deletions(-) diff --git a/README.md b/README.md index 2d20e48..5d6c6c6 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ MinecraftChat Web based Minecraft chat client for 1.8 servers. -![MinecraftChat Screenshot](http://puu.sh/huBzl/ec3c911abc.png) +![MinecraftChat Screenshot](http://puu.sh/hwR1L/9e88547904.png) ###Description This is a very lightweight application... ~500kb without modules. It is built on Node and utilizes tools such as [mineflayer](https://github.com/andrewrk/mineflayer), [node-minecraft-protocol](https://github.com/PrismarineJS/node-minecraft-protocol#windows) and [socket.io](http://socket.io/). The whole purpose is that you can chat on Minecraft servers from your browser. This makes it easier to just jump in, say a few things, and leave without having to wait for your game to load. diff --git a/app/server/bot/events/end.js b/app/server/bot/events/end.js index f8aa411..fc2b788 100644 --- a/app/server/bot/events/end.js +++ b/app/server/bot/events/end.js @@ -1,6 +1,6 @@ -module.exports = function(socket) { +module.exports = (socket) => { - socket.mcbot.on('end', function() { + socket.mcbot.on('end', () => { socket.emit('bot:disconnect'); delete socket.mcbot; }); diff --git a/app/server/bot/events/login.js b/app/server/bot/events/login.js index e248cb5..6ab55dd 100644 --- a/app/server/bot/events/login.js +++ b/app/server/bot/events/login.js @@ -1,7 +1,7 @@ -module.exports = function(socket) { +module.exports = (socket) => { // login event - socket.mcbot.on('login', function() { + socket.mcbot.on('login', () => { socket.emit('buffer:success', 'Successfully logged in as ' + socket.mcbot.username + ' with entity id ' + socket.mcbot.entity.id); socket.emit('bot:connect', { host: socket.connectionParams.hostname, diff --git a/app/server/bot/events/message.js b/app/server/bot/events/message.js index de97af6..099462b 100644 --- a/app/server/bot/events/message.js +++ b/app/server/bot/events/message.js @@ -4,10 +4,10 @@ var parseExtra = require('../../parsers/extra'); var escapeHtml = require('../../utils').escapeHtml; -module.exports = function(socket) { +module.exports = (socket) => { // message event - socket.mcbot.on('message', function(message) { + socket.mcbot.on('message', (message) => { // empty buffer var buffer = ''; @@ -40,7 +40,7 @@ module.exports = function(socket) { buffer = escapeHtml(buffer); // format the buffer with the correct coloring - buffer = buffer.replace(/§([0-9abcdef])([^§]*)/ig, function replace(regex, color, msg) { + buffer = buffer.replace(/§([0-9abcdef])([^§]*)/ig, (regex, color, msg) => { return '' + msg.replace(/ /g, ' ') + ''; }); diff --git a/app/server/bot/events/spawn.js b/app/server/bot/events/spawn.js index 453b68c..3d92a76 100644 --- a/app/server/bot/events/spawn.js +++ b/app/server/bot/events/spawn.js @@ -1,7 +1,7 @@ -module.exports = function(socket) { +module.exports = (socket) => { // spawn event - socket.mcbot.on('spawn', function() { + socket.mcbot.on('spawn', () => { var pos = socket.mcbot.entity.position; socket.emit('buffer:info', 'Spawned at X:' + pos.x + ', Y:' + pos.y + ', Z:' + pos.z); socket.emit('bot:players', socket.mcbot.players); diff --git a/app/server/bot/index.js b/app/server/bot/index.js index 2b22170..203598f 100644 --- a/app/server/bot/index.js +++ b/app/server/bot/index.js @@ -4,7 +4,7 @@ var message = require('./events/message'); var end = require('./events/end'); -module.exports = function(socket) { +module.exports = (socket) => { login(socket); spawn(socket); diff --git a/app/server/index.js b/app/server/index.js index d4ce491..b5263fd 100755 --- a/app/server/index.js +++ b/app/server/index.js @@ -29,7 +29,7 @@ require('./sockets')(io); // send homepage -app.get('/', function(req, res) { +app.get('/', (req, res) => { res.sendFile(path.join(__dirname, '../../public/templates/index.html')); }); @@ -44,12 +44,10 @@ app.set('port', process.env.PORT || 3000); // initialize http and socket servers -server.listen(app.get('port'), function() { +server.listen(app.get('port'), () => { console.log('> Server running on port %s\n', app.get('port')); }); // handle exceptions -process.on('uncaughtException', function(ex) { - console.error(ex.stack); -}); +process.on('uncaughtException', (ex) => console.error(ex.stack)); diff --git a/app/server/parsers/extra.js b/app/server/parsers/extra.js index d947d87..ab14bca 100644 --- a/app/server/parsers/extra.js +++ b/app/server/parsers/extra.js @@ -1,11 +1,11 @@ var stringToCode = require('../utils').stringToCode; -module.exports = function(extra) { +module.exports = (extra) => { var string = ''; // for each piece of text - extra.forEach(function(data) { + extra.forEach((data) => { // get the text out of the element var text; diff --git a/app/server/parsers/vanilla.js b/app/server/parsers/vanilla.js index 2701f6e..c8ed1bc 100644 --- a/app/server/parsers/vanilla.js +++ b/app/server/parsers/vanilla.js @@ -1,7 +1,7 @@ var stringToCode = require('../utils').stringToCode; var parseExtra = require('../parsers/extra'); -module.exports = function(jsonMsg) { +module.exports = (jsonMsg) => { var username, msg, sender, broadcast, connected, max, current, pages, player, victim, killer, achievement; var color = stringToCode(jsonMsg.color); diff --git a/app/server/sockets/events/chat.js b/app/server/sockets/events/chat.js index df69200..96ac7ca 100644 --- a/app/server/sockets/events/chat.js +++ b/app/server/sockets/events/chat.js @@ -1,6 +1,6 @@ -module.exports = function(socket) { +module.exports = (socket) => { - socket.on('chat', function(data) { + socket.on('chat', (data) => { if (socket.mcbot && socket.mcbot.entity) { socket.mcbot.chat(data.message); } diff --git a/app/server/sockets/events/connection.js b/app/server/sockets/events/connection.js index cd03662..99df210 100644 --- a/app/server/sockets/events/connection.js +++ b/app/server/sockets/events/connection.js @@ -1,9 +1,9 @@ var mineflayer = require('mineflayer'); var events = require('../../bot'); -module.exports = function(socket) { +module.exports = (socket) => { - socket.on('server:connect', function(data) { + socket.on('server:connect', (data) => { if (socket.mcbot) { socket.emit('buffer:error', 'Pleae disconnect before connecting again'); @@ -22,7 +22,7 @@ module.exports = function(socket) { socket.connectionParams = data; // prepare for errors - socket.mcbot.on('error', function(error) { + socket.mcbot.on('error', (error) => { if (error.toString() === 'Error: write after end') return; socket.emit('buffer:error', error); if (socket.mcbot.entity) socket.mcbot.end(); diff --git a/app/server/sockets/events/disconnection.js b/app/server/sockets/events/disconnection.js index 388f564..7866fa7 100644 --- a/app/server/sockets/events/disconnection.js +++ b/app/server/sockets/events/disconnection.js @@ -1,7 +1,7 @@ -module.exports = function(socket) { +module.exports = (socket) => { - socket.on('disconnect', function() { + socket.on('disconnect', () => { if (socket.mcbot) { socket.mcbot.end(); delete socket.mcbot; @@ -9,7 +9,7 @@ module.exports = function(socket) { }); - socket.on('bot:disconnect', function() { + socket.on('bot:disconnect', () => { if (socket.mcbot) { socket.mcbot.end(); delete socket.mcbot; diff --git a/app/server/sockets/events/players.js b/app/server/sockets/events/players.js index 19779d2..dbdb7ae 100644 --- a/app/server/sockets/events/players.js +++ b/app/server/sockets/events/players.js @@ -1,6 +1,6 @@ -module.exports = function(socket) { +module.exports = (socket) => { - socket.on('players', function() { + socket.on('players', () => { if (socket.mcbot && socket.mcbot.players) { socket.emit('bot:players', socket.mcbot.players); } diff --git a/app/server/sockets/index.js b/app/server/sockets/index.js index 60ba21d..efee82c 100755 --- a/app/server/sockets/index.js +++ b/app/server/sockets/index.js @@ -1,6 +1,6 @@ -module.exports = function(io) { +module.exports = (io) => { - io.on('connection', function(socket) { + io.on('connection', (socket) => { // bind all listeners to the socket require('./events/connection')(socket); diff --git a/app/server/utils/escapeHtml.js b/app/server/utils/escapeHtml.js index 2fe8b72..c7955d0 100644 --- a/app/server/utils/escapeHtml.js +++ b/app/server/utils/escapeHtml.js @@ -1,4 +1,4 @@ -module.exports = function escapeHtml(unsafe) { +module.exports = (unsafe) => { return unsafe .replace(/&/g, '&') .replace(/ { var dictionary = { 'black': 0,