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

SetupWizard: remove non-obvious dependencies on dynamic constants, require path in constructor

Browse Source
This commit is contained in:
Dylan K. Taylor 2019-08-25 16:46:01 +01:00
parent fdfbaf4e95
commit 51ed564c5e
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/PocketMine.php
View File

@ -262,7 +262,7 @@ namespace pocketmine {
$exitCode = 0; $exitCode = 0;
do{ do{
if(!file_exists(\pocketmine\DATA . "server.properties") and !isset($opts["no-wizard"])){ if(!file_exists(\pocketmine\DATA . "server.properties") and !isset($opts["no-wizard"])){
$installer = new SetupWizard(); $installer = new SetupWizard(\pocketmine\DATA);
if(!$installer->run()){ if(!$installer->run()){
$exitCode = -1; $exitCode = -1;
break; break;

16
src/wizard/SetupWizard.php
View File

@ -47,9 +47,11 @@ class SetupWizard{
/** @var Language */ /** @var Language */
private $lang; private $lang;
/** @var string */
private $dataPath;
public function __construct(){ public function __construct(string $dataPath){
$this->dataPath = $dataPath;
} }
public function run() : bool{ public function run() : bool{
@ -84,7 +86,7 @@ class SetupWizard{
} }
//this has to happen here to prevent user avoiding agreeing to license //this has to happen here to prevent user avoiding agreeing to license
$config = new Config(\pocketmine\DATA . "server.properties", Config::PROPERTIES); $config = new Config($this->dataPath . "/server.properties", Config::PROPERTIES);
$config->set("language", $lang); $config->set("language", $lang);
$config->save(); $config->save();
@ -132,7 +134,7 @@ LICENSE;
} }
private function generateBaseConfig() : void{ private function generateBaseConfig() : void{
$config = new Config(\pocketmine\DATA . "server.properties", Config::PROPERTIES); $config = new Config($this->dataPath . "/server.properties", Config::PROPERTIES);
$config->set("motd", ($name = $this->getInput($this->lang->get("name_your_server"), self::DEFAULT_NAME))); $config->set("motd", ($name = $this->getInput($this->lang->get("name_your_server"), self::DEFAULT_NAME)));
$config->set("server-name", $name); $config->set("server-name", $name);
@ -169,14 +171,14 @@ LICENSE;
if($op === ""){ if($op === ""){
$this->error($this->lang->get("op_warning")); $this->error($this->lang->get("op_warning"));
}else{ }else{
$ops = new Config(\pocketmine\DATA . "ops.txt", Config::ENUM); $ops = new Config($this->dataPath . "/ops.txt", Config::ENUM);
$ops->set($op, true); $ops->set($op, true);
$ops->save(); $ops->save();
} }
$this->message($this->lang->get("whitelist_info")); $this->message($this->lang->get("whitelist_info"));
$config = new Config(\pocketmine\DATA . "server.properties", Config::PROPERTIES); $config = new Config($this->dataPath . "/server.properties", Config::PROPERTIES);
if(strtolower($this->getInput($this->lang->get("whitelist_enable"), "n", "y/N")) === "y"){ if(strtolower($this->getInput($this->lang->get("whitelist_enable"), "n", "y/N")) === "y"){
$this->error($this->lang->get("whitelist_warning")); $this->error($this->lang->get("whitelist_warning"));
$config->set("white-list", true); $config->set("white-list", true);
@ -187,7 +189,7 @@ LICENSE;
} }
private function networkFunctions() : void{ private function networkFunctions() : void{
$config = new Config(\pocketmine\DATA . "server.properties", Config::PROPERTIES); $config = new Config($this->dataPath . "/server.properties", Config::PROPERTIES);
$this->error($this->lang->get("query_warning1")); $this->error($this->lang->get("query_warning1"));
$this->error($this->lang->get("query_warning2")); $this->error($this->lang->get("query_warning2"));
if(strtolower($this->getInput($this->lang->get("query_disable"), "n", "y/N")) === "y"){ if(strtolower($this->getInput($this->lang->get("query_disable"), "n", "y/N")) === "y"){