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

Stop hardcoding src/pocketmine/resources everywhere

Browse Source
This commit is contained in:
Dylan K. Taylor 2017-12-11 19:52:49 +00:00
parent 1f1531810d
commit dfc2d1dfe6
4 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pocketmine/Server.php
View File

@ -1459,7 +1459,7 @@ class Server{
$this->logger->info("Loading pocketmine.yml..."); $this->logger->info("Loading pocketmine.yml...");
if(!file_exists($this->dataPath . "pocketmine.yml")){ if(!file_exists($this->dataPath . "pocketmine.yml")){
$content = file_get_contents(\pocketmine\PATH . "src/pocketmine/resources/pocketmine.yml"); $content = file_get_contents(\pocketmine\RESOURCE_PATH . "pocketmine.yml");
if($version->isDev()){ if($version->isDev()){
$content = str_replace("preferred-channel: stable", "preferred-channel: beta", $content); $content = str_replace("preferred-channel: stable", "preferred-channel: beta", $content);
} }

2
src/pocketmine/entity/Effect.php
View File

@ -60,7 +60,7 @@ class Effect{
protected static $effects = []; protected static $effects = [];
public static function init(){ public static function init(){
$config = new Config(\pocketmine\PATH . "src/pocketmine/resources/effects.json", Config::JSON, []); $config = new Config(\pocketmine\RESOURCE_PATH . "effects.json", Config::JSON, []);
foreach($config->getAll() as $name => $data){ foreach($config->getAll() as $name => $data){
$color = hexdec(substr($data["color"], 3)); $color = hexdec(substr($data["color"], 3));

3
src/pocketmine/inventory/CraftingManager.php
View File

@ -51,8 +51,7 @@ class CraftingManager{
private $craftingDataCache; private $craftingDataCache;
public function __construct(){ public function __construct(){
// load recipes from src/pocketmine/resources/recipes.json $recipes = new Config(\pocketmine\RESOURCE_PATH . "recipes.json", Config::JSON, []);
$recipes = new Config(Server::getInstance()->getFilePath() . "src/pocketmine/resources/recipes.json", Config::JSON, []);
MainLogger::getLogger()->info("Loading recipes..."); MainLogger::getLogger()->info("Loading recipes...");
foreach($recipes->getAll() as $recipe){ foreach($recipes->getAll() as $recipe){

2
src/pocketmine/resourcepacks/ResourcePackManager.php
View File

@ -64,7 +64,7 @@ class ResourcePackManager{
} }
if(!file_exists($this->path . "resource_packs.yml")){ if(!file_exists($this->path . "resource_packs.yml")){
copy($this->server->getFilePath() . "src/pocketmine/resources/resource_packs.yml", $this->path . "resource_packs.yml"); copy(\pocketmine\RESOURCE_PATH . "resource_packs.yml", $this->path . "resource_packs.yml");
} }
$this->resourcePacksConfig = new Config($this->path . "resource_packs.yml", Config::YAML, []); $this->resourcePacksConfig = new Config($this->path . "resource_packs.yml", Config::YAML, []);