mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-04-21 08:17:34 +00:00
Code Issues Projects Releases Wiki Activity

Move resources/ directory out of src/

Browse Source 
this isn't source code and as such doesn't belong in here.
This commit is contained in:
Dylan K. Taylor 2018-11-05 09:39:49 +00:00
parent 2a5ab1f397
commit ce7718f0d1
8 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitmodules vendored
View File

@ -8,5 +8,5 @@
path = tests/plugins/PocketMine-DevTools
url = https://github.com/pmmp/PocketMine-DevTools.git
[submodule "src/pocketmine/resources/vanilla"]
path = src/pocketmine/resources/vanilla
path = resources/vanilla
url = https://github.com/pmmp/BedrockData.git

0
src/pocketmine/resources/pocketmine.yml → resources/pocketmine.yml
View File

0
src/pocketmine/resources/resource_packs.yml → resources/resource_packs.yml
View File

0
src/pocketmine/resources/runtimeid_table.json → resources/runtimeid_table.json
View File

0
src/pocketmine/resources/vanilla → resources/vanilla
View File

2
src/pocketmine/PocketMine.php
View File

@ -181,7 +181,7 @@ namespace pocketmine {
ini_set("memory_limit", '-1');
define('pocketmine\START_TIME', microtime(true));
define('pocketmine\RESOURCE_PATH', \pocketmine\PATH . 'src' . DIRECTORY_SEPARATOR . 'pocketmine' . DIRECTORY_SEPARATOR . 'resources' . DIRECTORY_SEPARATOR);
define('pocketmine\RESOURCE_PATH', \pocketmine\PATH . 'resources' . DIRECTORY_SEPARATOR);
$opts = getopt("", ["data:", "plugins:", "no-wizard"]);

2
tests/plugins/PocketMine-DevTools

@ -1 +1 @@
Subproject commit 3318ac4c0e6c0ea1bc7eb2d0f4e66a038ae581a9
Subproject commit cc6a5b5aa79fddb0a03715a503bae6f78add721c

2
tests/travis.sh
View File

@ -36,7 +36,7 @@ cd tests/plugins/PocketMine-DevTools
"$PHP_BINARY" -dphar.readonly=0 ./src/DevTools/ConsoleScript.php --make ./ --relative ./ --out ../../../DevTools.phar
cd ../../..
"$PHP_BINARY" -dphar.readonly=0 DevTools.phar --make src,vendor --relative ./ --entry src/pocketmine/PocketMine.php --out PocketMine-MP.phar
"$PHP_BINARY" -dphar.readonly=0 DevTools.phar --make src,vendor,resources --relative ./ --entry src/pocketmine/PocketMine.php --out PocketMine-MP.phar
if [ -f PocketMine-MP.phar ]; then
echo Server phar created successfully.
else