color parsing

This commit is contained in:
Rob
2022-02-27 00:27:29 -06:00
parent 4a08a5ce14
commit e7a59b2e97
2 changed files with 5 additions and 3 deletions

View File

@@ -5,6 +5,7 @@
"maxmind": "^4.3.5", "maxmind": "^4.3.5",
"minecraft-status": "^1.1.0", "minecraft-status": "^1.1.0",
"mineflayer": "^4.0.0", "mineflayer": "^4.0.0",
"node-mcpe-color-parser": "^0.1.1",
"tar-stream": "^2.2.0", "tar-stream": "^2.2.0",
"zlib": "^1.0.5" "zlib": "^1.0.5"
} }

View File

@@ -3,6 +3,7 @@ var status = require('minecraft-status').MinecraftServerListPing;
var mc = require('mineflayer'); var mc = require('mineflayer');
var fs = require('fs'); var fs = require('fs');
var maxmind; var maxmind;
var mcp = require('node-mcpe-color-parser');
//var mcClient = require('minecraft-protocol'); //var mcClient = require('minecraft-protocol');
process.params = (require('commandos')).parse(process.argv); process.params = (require('commandos')).parse(process.argv);
var MINECRAFT_DEFAULT_PORT = '25565-25566'; var MINECRAFT_DEFAULT_PORT = '25565-25566';
@@ -122,7 +123,7 @@ scan.on('result', function(data){
var theText = data.ip + ":" + data.port + "\t" + pingRes.version.name + "\t" + pingRes.players.online + " of " + pingRes.players.max + " players"; var theText = data.ip + ":" + data.port + "\t" + pingRes.version.name + "\t" + pingRes.players.online + " of " + pingRes.players.max + " players";
if(process.params['show-desc']) if(process.params['show-desc'])
{ {
theText += "\t"+pingRes.description.text.replace(/\n/g, ' '); theText += "\t"+mcp(pingRes.description.text).replace(/\n/g, ' ');
} }
if (SCAN_OPTS_OUTPUT_CSV) if (SCAN_OPTS_OUTPUT_CSV)
{ {
@@ -132,7 +133,7 @@ scan.on('result', function(data){
case "txt": case "txt":
line = data.ip + ":" + data.port + "\t" + pingRes.version.name.replace(/\,/g, '+'); line = data.ip + ":" + data.port + "\t" + pingRes.version.name.replace(/\,/g, '+');
if (process.params['log-desc']) { if (process.params['log-desc']) {
line += "\t" + pingRes.description.text.replace(/\n/g, ' '); line += "\t" + mcp(pingRes.description.text).replace(/\n/g, ' ');
} }
break; break;
case "txt-connect-only": case "txt-connect-only":
@@ -142,7 +143,7 @@ scan.on('result', function(data){
default: default:
line = data.ip + ":" + data.port + "," + pingRes.version.name.replace(/\,/g, '+') + "," + pingRes.players.online + "/" + pingRes.players.max; line = data.ip + ":" + data.port + "," + pingRes.version.name.replace(/\,/g, '+') + "," + pingRes.players.online + "/" + pingRes.players.max;
if (process.params['log-desc']) { if (process.params['log-desc']) {
line += "," + pingRes.description.text.replace(/\n/g, ' ').replace(/\,/g, ';'); line += "," + mcp(pingRes.description.text).replace(/\n/g, ' ').replace(/\,/g, ';');
} }
} }
if(process.params['geo-ip']) if(process.params['geo-ip'])