From e7a59b2e974bf462b05f226a03e00f30de7ef7ca Mon Sep 17 00:00:00 2001
From: Rob <me@rob.cat>
Date: Sun, 27 Feb 2022 00:27:29 -0600
Subject: [PATCH] color parsing

---
 package.json | 1 +
 scanner.js   | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index c39b618..b47469c 100644
--- a/package.json
+++ b/package.json
@@ -5,6 +5,7 @@
     "maxmind": "^4.3.5",
     "minecraft-status": "^1.1.0",
     "mineflayer": "^4.0.0",
+    "node-mcpe-color-parser": "^0.1.1",
     "tar-stream": "^2.2.0",
     "zlib": "^1.0.5"
   }
diff --git a/scanner.js b/scanner.js
index c9662fb..dc00841 100644
--- a/scanner.js
+++ b/scanner.js
@@ -3,6 +3,7 @@ var status = require('minecraft-status').MinecraftServerListPing;
 var mc = require('mineflayer');
 var fs = require('fs');
 var maxmind;
+var mcp = require('node-mcpe-color-parser');
 //var mcClient = require('minecraft-protocol');
 process.params = (require('commandos')).parse(process.argv);
 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";
 			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)
 			{
@@ -132,7 +133,7 @@ scan.on('result', function(data){
 					case "txt":
 						line = data.ip + ":" + data.port + "\t" + pingRes.version.name.replace(/\,/g, '+');
 						if (process.params['log-desc']) {
-							line += "\t" + pingRes.description.text.replace(/\n/g, ' ');
+							line += "\t" + mcp(pingRes.description.text).replace(/\n/g, ' ');
 						}
 						break;
 					case "txt-connect-only":
@@ -142,7 +143,7 @@ scan.on('result', function(data){
 					default:
 						line = data.ip + ":" + data.port + "," + pingRes.version.name.replace(/\,/g, '+') + "," + pingRes.players.online + "/" + pingRes.players.max;
 						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'])