From fd41a0f510ea5425c71b13e236fe63e1b7c22515 Mon Sep 17 00:00:00 2001
From: "Dylan K. Taylor" <dktapps@pmmp.io>
Date: Thu, 12 Aug 2021 20:35:25 +0100
Subject: [PATCH] Remove colors from VersionCommand these will have to stay
 gone for now, until we have some way to terminate formatting codes without
 breaking logger output. (we need &p!! #4364)

---
 resources/locale                        |  2 +-
 src/command/defaults/VersionCommand.php | 11 +++--------
 src/lang/KnownTranslationFactory.php    | 18 ++++++------------
 3 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/resources/locale b/resources/locale
index 26ea57220..b41efc904 160000
--- a/resources/locale
+++ b/resources/locale
@@ -1 +1 @@
-Subproject commit 26ea57220b388647c12bed051116b154aa8b88fe
+Subproject commit b41efc9044e1f6ab2d5c44ced3203ea18cba0165
diff --git a/src/command/defaults/VersionCommand.php b/src/command/defaults/VersionCommand.php
index 8bebadefb..82fe5e0db 100644
--- a/src/command/defaults/VersionCommand.php
+++ b/src/command/defaults/VersionCommand.php
@@ -60,22 +60,18 @@ class VersionCommand extends VanillaCommand{
 
 		if(count($args) === 0){
 			$sender->sendMessage(KnownTranslationFactory::pocketmine_command_version_serverSoftwareName(
-				TextFormat::GREEN,
 				VersionInfo::NAME
 			));
 			$sender->sendMessage(KnownTranslationFactory::pocketmine_command_version_serverSoftwareVersion(
-				TextFormat::GREEN,
 				VersionInfo::getVersionObj()->getFullVersion(),
 				VersionInfo::getGitHash()
 			));
 			$sender->sendMessage(KnownTranslationFactory::pocketmine_command_version_minecraftVersion(
-				TextFormat::GREEN,
 				ProtocolInfo::MINECRAFT_VERSION_NETWORK,
 				(string) ProtocolInfo::CURRENT_PROTOCOL
 			));
-			$sender->sendMessage(KnownTranslationFactory::pocketmine_command_version_phpVersion(TextFormat::GREEN, PHP_VERSION));
+			$sender->sendMessage(KnownTranslationFactory::pocketmine_command_version_phpVersion(PHP_VERSION));
 
-			$jitColor = TextFormat::GREEN;
 			if(
 				function_exists('opcache_get_status') &&
 				($opcacheStatus = opcache_get_status(false)) !== false &&
@@ -86,15 +82,14 @@ class VersionCommand extends VanillaCommand{
 					$jitStatus = KnownTranslationFactory::pocketmine_command_version_phpJitEnabled(
 						sprintf("CRTO: %s%s%s%s", $jit["opt_flags"] >> 2, $jit["opt_flags"] & 0x03, $jit["kind"], $jit["opt_level"])
 					);
-					$jitColor = TextFormat::YELLOW;
 				}else{
 					$jitStatus = KnownTranslationFactory::pocketmine_command_version_phpJitDisabled();
 				}
 			}else{
 				$jitStatus = KnownTranslationFactory::pocketmine_command_version_phpJitNotSupported();
 			}
-			$sender->sendMessage(KnownTranslationFactory::pocketmine_command_version_phpJitStatus($jitColor, $sender->getLanguage()->translate($jitStatus)));
-			$sender->sendMessage(KnownTranslationFactory::pocketmine_command_version_operatingSystem(TextFormat::GREEN, Utils::getOS()));
+			$sender->sendMessage(KnownTranslationFactory::pocketmine_command_version_phpJitStatus($sender->getLanguage()->translate($jitStatus)));
+			$sender->sendMessage(KnownTranslationFactory::pocketmine_command_version_operatingSystem(Utils::getOS()));
 		}else{
 			$pluginName = implode(" ", $args);
 			$exactPlugin = $sender->getServer()->getPluginManager()->getPlugin($pluginName);
diff --git a/src/lang/KnownTranslationFactory.php b/src/lang/KnownTranslationFactory.php
index 9c5037377..7156de7cb 100644
--- a/src/lang/KnownTranslationFactory.php
+++ b/src/lang/KnownTranslationFactory.php
@@ -1124,9 +1124,8 @@ final class KnownTranslationFactory{
 		return new TranslationContainer(KnownTranslationKeys::POCKETMINE_COMMAND_VERSION_DESCRIPTION, []);
 	}
 
-	public static function pocketmine_command_version_minecraftVersion(string $color, string $minecraftVersion, string $minecraftProtocolVersion) : TranslationContainer{
+	public static function pocketmine_command_version_minecraftVersion(string $minecraftVersion, string $minecraftProtocolVersion) : TranslationContainer{
 		return new TranslationContainer(KnownTranslationKeys::POCKETMINE_COMMAND_VERSION_MINECRAFTVERSION, [
-			"color" => $color,
 			"minecraftVersion" => $minecraftVersion,
 			"minecraftProtocolVersion" => $minecraftProtocolVersion,
 		]);
@@ -1136,9 +1135,8 @@ final class KnownTranslationFactory{
 		return new TranslationContainer(KnownTranslationKeys::POCKETMINE_COMMAND_VERSION_NOSUCHPLUGIN, []);
 	}
 
-	public static function pocketmine_command_version_operatingSystem(string $color, string $operatingSystemName) : TranslationContainer{
+	public static function pocketmine_command_version_operatingSystem(string $operatingSystemName) : TranslationContainer{
 		return new TranslationContainer(KnownTranslationKeys::POCKETMINE_COMMAND_VERSION_OPERATINGSYSTEM, [
-			"color" => $color,
 			"operatingSystemName" => $operatingSystemName,
 		]);
 	}
@@ -1157,30 +1155,26 @@ final class KnownTranslationFactory{
 		return new TranslationContainer(KnownTranslationKeys::POCKETMINE_COMMAND_VERSION_PHPJITNOTSUPPORTED, []);
 	}
 
-	public static function pocketmine_command_version_phpJitStatus(string $color, string $jitStatus) : TranslationContainer{
+	public static function pocketmine_command_version_phpJitStatus(string $jitStatus) : TranslationContainer{
 		return new TranslationContainer(KnownTranslationKeys::POCKETMINE_COMMAND_VERSION_PHPJITSTATUS, [
-			"color" => $color,
 			"jitStatus" => $jitStatus,
 		]);
 	}
 
-	public static function pocketmine_command_version_phpVersion(string $color, string $phpVersion) : TranslationContainer{
+	public static function pocketmine_command_version_phpVersion(string $phpVersion) : TranslationContainer{
 		return new TranslationContainer(KnownTranslationKeys::POCKETMINE_COMMAND_VERSION_PHPVERSION, [
-			"color" => $color,
 			"phpVersion" => $phpVersion,
 		]);
 	}
 
-	public static function pocketmine_command_version_serverSoftwareName(string $color, string $serverSoftwareName) : TranslationContainer{
+	public static function pocketmine_command_version_serverSoftwareName(string $serverSoftwareName) : TranslationContainer{
 		return new TranslationContainer(KnownTranslationKeys::POCKETMINE_COMMAND_VERSION_SERVERSOFTWARENAME, [
-			"color" => $color,
 			"serverSoftwareName" => $serverSoftwareName,
 		]);
 	}
 
-	public static function pocketmine_command_version_serverSoftwareVersion(string $color, string $serverSoftwareVersion, string $serverGitHash) : TranslationContainer{
+	public static function pocketmine_command_version_serverSoftwareVersion(string $serverSoftwareVersion, string $serverGitHash) : TranslationContainer{
 		return new TranslationContainer(KnownTranslationKeys::POCKETMINE_COMMAND_VERSION_SERVERSOFTWAREVERSION, [
-			"color" => $color,
 			"serverSoftwareVersion" => $serverSoftwareVersion,
 			"serverGitHash" => $serverGitHash,
 		]);