Added console coloring and made the log not contain any usernames/session ids

2 files changed, 26 insertions, 9 deletions

diff --git a/logic/MinecraftProcess.cpp b/logic/MinecraftProcess.cpp
index 6ac5b886..c33d34a8 100644
--- a/logic/MinecraftProcess.cpp
+++ b/logic/MinecraftProcess.cpp
@@ -84,17 +84,14 @@ void MinecraftProcess::on_stdErr()
 	for(int i = 0; i < lines.size() - 1; i++)
 	{
 		QString & line = lines[i];
-		MessageLevel::Enum level = MessageLevel::Error;
-		if(line.contains("[INFO]") || line.contains("[CONFIG]") || line.contains("[FINE]") || line.contains("[FINER]") || line.contains("[FINEST]") )
-			level = MessageLevel::Message;
-		if(line.contains("[SEVERE]") || line.contains("[WARNING]") || line.contains("[STDERR]"))
-			level = MessageLevel::Error;
-		emit log(lines[i].toLocal8Bit(), level);
+		emit log(line.replace(username, "<Username>").replace(sessionID, "<Session ID>").toLocal8Bit(), getLevel(line, MessageLevel::Error));
 	}
 	if(!complete)
 		m_err_leftover = lines.last();
 }
 
+
+
 void MinecraftProcess::on_stdOut()
 {
 	QByteArray data = readAllStandardOutput();
@@ -106,7 +103,7 @@ void MinecraftProcess::on_stdOut()
 	for(int i = 0; i < lines.size() - 1; i++)
 	{
 		QString & line = lines[i];
-		emit log(lines[i].toLocal8Bit(), MessageLevel::Message);
+		emit log(line.replace(username, "<Username>").replace(sessionID, "<Session ID>").toLocal8Bit(), getLevel(line, MessageLevel::Message));
 	}
 	if(!complete)
 		m_out_leftover = lines.last();
@@ -167,7 +164,7 @@ void MinecraftProcess::launch()
 	emit log(QString("Minecraft folder is: '%1'").arg(workingDirectory()));
 	QString JavaPath = m_instance->settings().get("JavaPath").toString();
 	emit log(QString("Java path: '%1'").arg(JavaPath));
-	emit log(QString("Arguments: '%1'").arg(m_args.join("' '")));
+	emit log(QString("Arguments: '%1'").arg(m_args.join("' '").replace(username, "<Username>").replace(sessionID, "<Session ID>")));
 	start(JavaPath, m_args);
 	if (!waitForStarted())
 	{
@@ -177,4 +174,19 @@ void MinecraftProcess::launch()
 	}
 }
 
-
+MessageLevel::Enum MinecraftProcess::getLevel(const QString &line, MessageLevel::Enum level)
+{
+	
+	if(line.contains("[INFO]") || line.contains("[CONFIG]") || line.contains("[FINE]") || line.contains("[FINER]") || line.contains("[FINEST]") )
+		level = MessageLevel::Message;
+	if(line.contains("[SEVERE]") || line.contains("[STDERR]"))
+		level = MessageLevel::Error;
+	if(line.contains("[WARNING]"))
+		level = MessageLevel::Warning;
+	if(line.contains("Exception in thread") || line.contains("    at "))
+		level = MessageLevel::Fatal;
+	if(line.contains("[DEBUG]"))
+		level = MessageLevel::Debug;
+	return level;
+	
+}
\ No newline at end of file
diff --git a/logic/MinecraftProcess.h b/logic/MinecraftProcess.h
index 248ad807..a1dfa23f 100644
--- a/logic/MinecraftProcess.h
+++ b/logic/MinecraftProcess.h
@@ -61,6 +61,8 @@ public:
 	
 	void killMinecraft();
 	
+	inline void setLogin(QString user, QString sid) { username = user; sessionID = sid; }
+	
 signals:
 	/**
 	 * @brief emitted when mc has finished and the PostLaunchCommand was run
@@ -87,4 +89,7 @@ protected slots:
 	void on_stdOut();
 private:
 	bool killed;
+	MessageLevel::Enum getLevel(const QString &message, MessageLevel::Enum defaultLevel);
+	QString sessionID;
+	QString username;
 };