mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-07-20 18:06:40 +00:00
Code Issues Projects Releases Wiki Activity

Remove colors from VersionCommand

Browse Source 
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)
This commit is contained in:
Dylan K. Taylor 2021-08-12 20:35:25 +01:00
parent d18b5cb306
commit fd41a0f510
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
3 changed files with 10 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/locale

@ -1 +1 @@
Subproject commit 26ea57220b388647c12bed051116b154aa8b88fe Subproject commit b41efc9044e1f6ab2d5c44ced3203ea18cba0165

11
src/command/defaults/VersionCommand.php
View File

@ -60,22 +60,18 @@ class VersionCommand extends VanillaCommand{
if(count($args) === 0){ if(count($args) === 0){
$sender->sendMessage(KnownTranslationFactory::pocketmine_command_version_serverSoftwareName( $sender->sendMessage(KnownTranslationFactory::pocketmine_command_version_serverSoftwareName(
TextFormat::GREEN,
VersionInfo::NAME VersionInfo::NAME
)); ));
$sender->sendMessage(KnownTranslationFactory::pocketmine_command_version_serverSoftwareVersion( $sender->sendMessage(KnownTranslationFactory::pocketmine_command_version_serverSoftwareVersion(
TextFormat::GREEN,
VersionInfo::getVersionObj()->getFullVersion(), VersionInfo::getVersionObj()->getFullVersion(),
VersionInfo::getGitHash() VersionInfo::getGitHash()
)); ));
$sender->sendMessage(KnownTranslationFactory::pocketmine_command_version_minecraftVersion( $sender->sendMessage(KnownTranslationFactory::pocketmine_command_version_minecraftVersion(
TextFormat::GREEN,
ProtocolInfo::MINECRAFT_VERSION_NETWORK, ProtocolInfo::MINECRAFT_VERSION_NETWORK,
(string) ProtocolInfo::CURRENT_PROTOCOL (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( if(
function_exists('opcache_get_status') && function_exists('opcache_get_status') &&
($opcacheStatus = opcache_get_status(false)) !== false && ($opcacheStatus = opcache_get_status(false)) !== false &&
@ -86,15 +82,14 @@ class VersionCommand extends VanillaCommand{
$jitStatus = KnownTranslationFactory::pocketmine_command_version_phpJitEnabled( $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"]) sprintf("CRTO: %s%s%s%s", $jit["opt_flags"] >> 2, $jit["opt_flags"] & 0x03, $jit["kind"], $jit["opt_level"])
); );
$jitColor = TextFormat::YELLOW;
}else{ }else{
$jitStatus = KnownTranslationFactory::pocketmine_command_version_phpJitDisabled(); $jitStatus = KnownTranslationFactory::pocketmine_command_version_phpJitDisabled();
} }
}else{ }else{
$jitStatus = KnownTranslationFactory::pocketmine_command_version_phpJitNotSupported(); $jitStatus = KnownTranslationFactory::pocketmine_command_version_phpJitNotSupported();
} }
$sender->sendMessage(KnownTranslationFactory::pocketmine_command_version_phpJitStatus($jitColor, $sender->getLanguage()->translate($jitStatus))); $sender->sendMessage(KnownTranslationFactory::pocketmine_command_version_phpJitStatus($sender->getLanguage()->translate($jitStatus)));
$sender->sendMessage(KnownTranslationFactory::pocketmine_command_version_operatingSystem(TextFormat::GREEN, Utils::getOS())); $sender->sendMessage(KnownTranslationFactory::pocketmine_command_version_operatingSystem(Utils::getOS()));
}else{ }else{
$pluginName = implode(" ", $args); $pluginName = implode(" ", $args);
$exactPlugin = $sender->getServer()->getPluginManager()->getPlugin($pluginName); $exactPlugin = $sender->getServer()->getPluginManager()->getPlugin($pluginName);

18
src/lang/KnownTranslationFactory.php
View File

@ -1124,9 +1124,8 @@ final class KnownTranslationFactory{
return new TranslationContainer(KnownTranslationKeys::POCKETMINE_COMMAND_VERSION_DESCRIPTION, []); 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, [ return new TranslationContainer(KnownTranslationKeys::POCKETMINE_COMMAND_VERSION_MINECRAFTVERSION, [
"color" => $color,
"minecraftVersion" => $minecraftVersion, "minecraftVersion" => $minecraftVersion,
"minecraftProtocolVersion" => $minecraftProtocolVersion, "minecraftProtocolVersion" => $minecraftProtocolVersion,
]); ]);
@ -1136,9 +1135,8 @@ final class KnownTranslationFactory{
return new TranslationContainer(KnownTranslationKeys::POCKETMINE_COMMAND_VERSION_NOSUCHPLUGIN, []); 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, [ return new TranslationContainer(KnownTranslationKeys::POCKETMINE_COMMAND_VERSION_OPERATINGSYSTEM, [
"color" => $color,
"operatingSystemName" => $operatingSystemName, "operatingSystemName" => $operatingSystemName,
]); ]);
} }
@ -1157,30 +1155,26 @@ final class KnownTranslationFactory{
return new TranslationContainer(KnownTranslationKeys::POCKETMINE_COMMAND_VERSION_PHPJITNOTSUPPORTED, []); 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, [ return new TranslationContainer(KnownTranslationKeys::POCKETMINE_COMMAND_VERSION_PHPJITSTATUS, [
"color" => $color,
"jitStatus" => $jitStatus, "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, [ return new TranslationContainer(KnownTranslationKeys::POCKETMINE_COMMAND_VERSION_PHPVERSION, [
"color" => $color,
"phpVersion" => $phpVersion, "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, [ return new TranslationContainer(KnownTranslationKeys::POCKETMINE_COMMAND_VERSION_SERVERSOFTWARENAME, [
"color" => $color,
"serverSoftwareName" => $serverSoftwareName, "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, [ return new TranslationContainer(KnownTranslationKeys::POCKETMINE_COMMAND_VERSION_SERVERSOFTWAREVERSION, [
"color" => $color,
"serverSoftwareVersion" => $serverSoftwareVersion, "serverSoftwareVersion" => $serverSoftwareVersion,
"serverGitHash" => $serverGitHash, "serverGitHash" => $serverGitHash,
]); ]);