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

Moved JSON blobs to submodule

Browse Source
This commit is contained in:
Dylan K. Taylor 2018-06-12 18:49:18 +01:00
parent c9ec6f0a63
commit 2e9e44ba05
4 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -10,3 +10,6 @@
[submodule "tests/plugins/PocketMine-TesterPlugin"] [submodule "tests/plugins/PocketMine-TesterPlugin"]
path = tests/plugins/PocketMine-TesterPlugin path = tests/plugins/PocketMine-TesterPlugin
url = https://github.com/pmmp/PocketMine-TesterPlugin.git url = https://github.com/pmmp/PocketMine-TesterPlugin.git
[submodule "src/pocketmine/resources/vanilla"]
path = src/pocketmine/resources/vanilla
url = https://github.com/pmmp/BedrockData.git

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

@ -47,7 +47,7 @@ class CraftingManager{
} }
public function init() : void{ public function init() : void{
$recipes = new Config(\pocketmine\RESOURCE_PATH . "recipes.json", Config::JSON, []); $recipes = new Config(\pocketmine\RESOURCE_PATH . "vanilla" . DIRECTORY_SEPARATOR . "recipes.json", Config::JSON, []);
foreach($recipes->getAll() as $recipe){ foreach($recipes->getAll() as $recipe){
switch($recipe["type"]){ switch($recipe["type"]){

2
src/pocketmine/item/Item.php
View File

@ -119,7 +119,7 @@ class Item implements ItemIds, \JsonSerializable{
public static function initCreativeItems(){ public static function initCreativeItems(){
self::clearCreativeItems(); self::clearCreativeItems();
$creativeItems = new Config(\pocketmine\RESOURCE_PATH . "creativeitems.json", Config::JSON, []); $creativeItems = new Config(\pocketmine\RESOURCE_PATH . "vanilla" . DIRECTORY_SEPARATOR . "creativeitems.json", Config::JSON, []);
foreach($creativeItems->getAll() as $data){ foreach($creativeItems->getAll() as $data){
$item = Item::jsonDeserialize($data); $item = Item::jsonDeserialize($data);

1
src/pocketmine/resources/vanilla Submodule

@ -0,0 +1 @@
Subproject commit 0c00c4f3b9de1b6b0866cab79a66a91182ae5405