thor/MinecraftChat
1
0
Fork 0
mirror of https://github.com/Threnklyn/MinecraftChat.git synced 2026-05-18 20:33:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use ES6 string interpolation

Browse Source
This commit is contained in:
AlexKvazos
2015-05-01 12:01:21 -05:00
parent 06b4989a57
commit 6ee4de3920
5 changed files with 38 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/server/bot/events/login.js
+2 -2
View File
@@ -1,13 +1,13 @@
module.exports = (socket) => {
socket.mcbot.on('login', () => {
socket.emit('buffer:success', 'Successfully logged in as ' + socket.mcbot.username + ' with entity id ' + socket.mcbot.entity.id);
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,
port: socket.connectionParams.port,
username: socket.mcbot.username
});
console.log('logged in > ' + socket.connectionParams.hostname + ':' + socket.connectionParams.port + ' - ' + ' Username: ' + socket.mcbot.username);
console.log(`logged in > ${socket.connectionParams.hostname}:${socket.connectionParams.port} - Username: ${socket.mcbot.username}`);
});
};
app/server/bot/events/spawn.js
+1 -1
View File
@@ -2,7 +2,7 @@ module.exports = (socket) => {
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('buffer:info', `Spawned at X:${pos.x}, Y:${pos.y}, Z:${pos.z}`);
socket.emit('bot:players', socket.mcbot.players);
});
app/server/index.js
+4 -1
View File
@@ -25,7 +25,10 @@ var io = socketio(server);
// setup socket.io-redis if connection variables are set
if (process.env.REDIS_HOST && process.env.REDIS_PORT) {
io.adapter(redis({ host: process.env.REDIS_HOST, port: process.env.REDIS_PORT }));
io.adapter(redis({
host: process.env.REDIS_HOST,
port: process.env.REDIS_PORT
}));
}
app/server/parsers/vanilla.js
+30 -22
View File
@@ -3,7 +3,9 @@ import parseExtra from '../parsers/extra';
module.exports = (jsonMsg) => {
var username, msg, sender, broadcast, connected, max, current, pages, player, victim, killer, achievement;
var username, msg, sender, broadcast, connected, max, usage,
current, pages, player, victim, killer, achievement;
var color = stringToCode(jsonMsg.color);
switch (jsonMsg.translate) {
@@ -11,77 +13,79 @@ module.exports = (jsonMsg) => {
case 'chat.type.text':
username = jsonMsg.with[0].text;
msg = jsonMsg.with[1];
return '§' + color + '<' + username + '> ' + msg;
return `§${color}<${username}> ${msg}`;
case 'chat.type.announcement':
sender = jsonMsg.with[0];
broadcast = parseExtra(jsonMsg.with[1].extra);
return '§' + color + '[' + sender + '] ' + broadcast;
return `§${color}[${sender}] ${broadcast}`;
case 'commands.generic.notFound':
return '§' + color + 'Unknown command. Try /help for a list of commands';
return `§${color}Unknown command. Try /help for a list of commands`;
case 'commands.players.list':
connected = jsonMsg.with[0];
max = jsonMsg.with[1];
return '§' + color + 'There are ' + connected + '/' + max + ' players online:';
return `§${color}There are ${connected}/${max} players online:`;
case 'commands.help.header':
current = jsonMsg.with[0];
pages = jsonMsg.with[1];
return '§' + color + '--- Showing help page ' + current + ' of ' + pages + ' (/help <page>) ---';
return `§${color}--- Showing help page ${current} of ${pages} (/help <page>) ---`;
case 'commands.generic.usage':
return '§' + color + 'Usage: ' + parseCommandUsage(jsonMsg.with[0].translate);
usage = parseCommandUsage(jsonMsg.with[0].translate);
return `§${color}Usage: ${usage}`;
case 'multiplayer.player.left':
player = jsonMsg.with[0].text;
return '§' + color + player + ' left the game';
return `§${color}${player} left the game`;
case 'multiplayer.player.joined':
player = jsonMsg.with[0].text;
return '§' + color + player + ' joined the game';
return `§${color}${player} joined the game`;
case 'chat.type.admin':
return '§' + color + '[' + jsonMsg.with[0] + ': ' + parseAdmin(jsonMsg.with[1]) + ']';
sender = jsonMsg.with[0];
msg = parseAdmin(jsonMsg.with[1]);
return `§${color}[${sender}: ${msg}]`;
case 'death.attack.mob':
victim = jsonMsg.with[0].text;
killer = jsonMsg.with[1].text;
return '§' + color + victim + ' was slain by ' + killer;
return `§${color}${victim} was slain by ${killer}`;
case 'death.attack.arrow':
victim = jsonMsg.with[0].text;
killer = jsonMsg.with[1].text;
return '§' + color + victim + ' was shot by ' + killer;
return `§${color}${victim} was shot by ${killer}`;
case 'death.attack.player':
victim = jsonMsg.with[0].text;
killer = jsonMsg.with[1].text;
return '§' + color + victim + ' was slain by ' + killer;
return `§${color}${victim} was slain by ${killer}`;
case 'death.attack.explosion.player':
victim = jsonMsg.with[0].text;
killer = jsonMsg.with[1].text;
return '§' + color + victim + ' was blown up by ' + killer;
return `§${color}${victim} was blown up by ${killer}`;
case 'chat.type.achievement':
player = jsonMsg.with[0].text;
achievement = jsonMsg.with[1].extra[0].translate;
return '§' + color + player + ' has just earned the achievement ' + '§a[' + parseAchievement(achievement) + ']';
achievement = parseAchievement(jsonMsg.with[1].extra[0].translate);
return `§${color}${player} has just earned the achievement §a[${achievement}]`;
}
@@ -95,7 +99,7 @@ module.exports = (jsonMsg) => {
function parseAdmin(command) {
var player, gamemode;
var player, gamemode, p1, p2;
switch (command.translate) {
@@ -103,19 +107,23 @@ function parseAdmin(command) {
return 'Toggled downfall';
case 'commands.op.success':
return 'Opped ' + command.with[0];
player = command.with[0];
return `Opped ${player}`;
case 'commands.tp.success':
return 'Teleported ' + command.with[0] + ' to ' + command.with[1];
p1 = command.with[0];
p2 = command.with[1];
return `Teleported ${p1} to ${p2}`;
case 'commands.kill.successful':
return 'Killed ' + command.with[0];
player = command.with[0];
return `Killed ${player}`;
case 'commands.gamemode.success.other':
player = command.with[0];
gamemode = command.with[1].translate.split('.')[1];
gamemode = gamemode.charAt(0).toUpperCase() + gamemode.slice(1);
return 'Set ' + player + ' game mode to ' + gamemode + ' Mode';
return `Set ${player} game mode to ${gamemode} Mode`;
default:
return 'Unknown admin message';
app/server/sockets/events/connection.js
+1 -1
View File
@@ -15,7 +15,7 @@ module.exports = (socket) => {
// if a bot already exists, ask user to disconnect
if (socket.mcbot) {
socket.emit('buffer:error', 'Pleae disconnect before connecting again');
socket.emit('buffer:error', 'Please disconnect before connecting again');
return;
}