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

Convert VersionInfo into a final class

Browse Source 
this allows it to be loaded by the autoloader without additional changes.
This commit is contained in:
Dylan K. Taylor
2020-07-25 19:00:48 +01:00
parent 5910905e95
commit 2645b19617
11 changed files with 45 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/Server.php
View File

@ -280,7 +280,7 @@ class Server{
private $playerList = [];
public function getName() : string{
return \pocketmine\NAME;
return VersionInfo::NAME;
}
public function isRunning() : bool{
@ -296,7 +296,7 @@ class Server{
}
public function getApiVersion() : string{
return \pocketmine\BASE_VERSION;
return VersionInfo::BASE_VERSION;
}
public function getFilePath() : string{
@ -385,7 +385,7 @@ class Server{
}
public function getMotd() : string{
return $this->configGroup->getConfigString("motd", \pocketmine\NAME . " Server");
return $this->configGroup->getConfigString("motd", VersionInfo::NAME . " Server");
}
/**
@ -778,7 +778,7 @@ class Server{
$this->logger->info("Loading server configuration");
if(!file_exists($this->dataPath . "pocketmine.yml")){
$content = file_get_contents(\pocketmine\RESOURCE_PATH . "pocketmine.yml");
if(\pocketmine\IS_DEVELOPMENT_BUILD){
if(VersionInfo::IS_DEVELOPMENT_BUILD){
$content = str_replace("preferred-channel: stable", "preferred-channel: beta", $content);
}
@file_put_contents($this->dataPath . "pocketmine.yml", $content);
@ -787,7 +787,7 @@ class Server{
$this->configGroup = new ServerConfigGroup(
new Config($this->dataPath . "pocketmine.yml", Config::YAML, []),
new Config($this->dataPath . "server.properties", Config::PROPERTIES, [
"motd" => \pocketmine\NAME . " Server",
"motd" => VersionInfo::NAME . " Server",
"server-port" => 19132,
"white-list" => false,
"max-players" => 20,
@ -829,9 +829,9 @@ class Server{
$this->logger->info($this->getLanguage()->translateString("language.selected", [$this->getLanguage()->getName(), $this->getLanguage()->getLang()]));
if(\pocketmine\IS_DEVELOPMENT_BUILD){
if(VersionInfo::IS_DEVELOPMENT_BUILD){
if(!((bool) $this->configGroup->getProperty("settings.enable-dev-builds", false))){
$this->logger->emergency($this->language->translateString("pocketmine.server.devBuild.error1", [\pocketmine\NAME]));
$this->logger->emergency($this->language->translateString("pocketmine.server.devBuild.error1", [VersionInfo::NAME]));
$this->logger->emergency($this->language->translateString("pocketmine.server.devBuild.error2"));
$this->logger->emergency($this->language->translateString("pocketmine.server.devBuild.error3"));
$this->logger->emergency($this->language->translateString("pocketmine.server.devBuild.error4", ["settings.enable-dev-builds"]));
@ -842,7 +842,7 @@ class Server{
}
$this->logger->warning(str_repeat("-", 40));
$this->logger->warning($this->language->translateString("pocketmine.server.devBuild.warning1", [\pocketmine\NAME]));
$this->logger->warning($this->language->translateString("pocketmine.server.devBuild.warning1", [VersionInfo::NAME]));
$this->logger->warning($this->language->translateString("pocketmine.server.devBuild.warning2"));
$this->logger->warning($this->language->translateString("pocketmine.server.devBuild.warning3"));
$this->logger->warning(str_repeat("-", 40));
@ -923,7 +923,7 @@ class Server{
$this->logger->info($this->getLanguage()->translateString("pocketmine.server.info", [
$this->getName(),
(\pocketmine\IS_DEVELOPMENT_BUILD ? TextFormat::YELLOW : "") . $this->getPocketMineVersion() . TextFormat::RESET
(VersionInfo::IS_DEVELOPMENT_BUILD ? TextFormat::YELLOW : "") . $this->getPocketMineVersion() . TextFormat::RESET
]));
$this->logger->info($this->getLanguage()->translateString("pocketmine.server.license", [$this->getName()]));