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

BedrockDataFiles: added constants for folders as well as files

Browse Source 
we probably should have it recurse too, but this is an easy win.
This commit is contained in:
Dylan K. Taylor 2025-02-16 20:57:16 +00:00
parent 91ac64783f
commit 03e4b53ac4
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
4 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/generate-bedrockdata-path-consts.php
View File

@ -28,6 +28,7 @@ use function dirname;
use function fclose; use function fclose;
use function fopen; use function fopen;
use function fwrite; use function fwrite;
use function is_dir;
use function is_file; use function is_file;
use function scandir; use function scandir;
use function str_replace; use function str_replace;
@ -59,7 +60,7 @@ foreach($files as $file){
continue; continue;
} }
$path = Path::join(BEDROCK_DATA_PATH, $file); $path = Path::join(BEDROCK_DATA_PATH, $file);
if(!is_file($path)){ if(!is_file($path) && !is_dir($path)){
continue; continue;
} }
@ -67,6 +68,7 @@ foreach($files as $file){
'README.md', 'README.md',
'LICENSE', 'LICENSE',
'composer.json', 'composer.json',
'.github'
] as $ignored){ ] as $ignored){
if($file === $ignored){ if($file === $ignored){
continue 2; continue 2;

3
src/Server.php
View File

@ -36,6 +36,7 @@ use pocketmine\crafting\CraftingManager;
use pocketmine\crafting\CraftingManagerFromDataHelper; use pocketmine\crafting\CraftingManagerFromDataHelper;
use pocketmine\crash\CrashDump; use pocketmine\crash\CrashDump;
use pocketmine\crash\CrashDumpRenderer; use pocketmine\crash\CrashDumpRenderer;
use pocketmine\data\bedrock\BedrockDataFiles;
use pocketmine\entity\EntityDataHelper; use pocketmine\entity\EntityDataHelper;
use pocketmine\entity\Location; use pocketmine\entity\Location;
use pocketmine\event\HandlerListManager; use pocketmine\event\HandlerListManager;
@ -1005,7 +1006,7 @@ class Server{
$this->commandMap = new SimpleCommandMap($this); $this->commandMap = new SimpleCommandMap($this);
$this->craftingManager = CraftingManagerFromDataHelper::make(Path::join(\pocketmine\BEDROCK_DATA_PATH, "recipes")); $this->craftingManager = CraftingManagerFromDataHelper::make(BedrockDataFiles::RECIPES);
$this->resourceManager = new ResourcePackManager(Path::join($this->dataPath, "resource_packs"), $this->logger); $this->resourceManager = new ResourcePackManager(Path::join($this->dataPath, "resource_packs"), $this->logger);

3
src/data/bedrock/BedrockDataFiles.php
View File

@ -39,13 +39,16 @@ final class BedrockDataFiles{
public const BLOCK_STATE_META_MAP_JSON = BEDROCK_DATA_PATH . '/block_state_meta_map.json'; public const BLOCK_STATE_META_MAP_JSON = BEDROCK_DATA_PATH . '/block_state_meta_map.json';
public const CANONICAL_BLOCK_STATES_NBT = BEDROCK_DATA_PATH . '/canonical_block_states.nbt'; public const CANONICAL_BLOCK_STATES_NBT = BEDROCK_DATA_PATH . '/canonical_block_states.nbt';
public const COMMAND_ARG_TYPES_JSON = BEDROCK_DATA_PATH . '/command_arg_types.json'; public const COMMAND_ARG_TYPES_JSON = BEDROCK_DATA_PATH . '/command_arg_types.json';
public const CREATIVE = BEDROCK_DATA_PATH . '/creative';
public const ENTITY_ID_MAP_JSON = BEDROCK_DATA_PATH . '/entity_id_map.json'; public const ENTITY_ID_MAP_JSON = BEDROCK_DATA_PATH . '/entity_id_map.json';
public const ENTITY_IDENTIFIERS_NBT = BEDROCK_DATA_PATH . '/entity_identifiers.nbt'; public const ENTITY_IDENTIFIERS_NBT = BEDROCK_DATA_PATH . '/entity_identifiers.nbt';
public const ENUMS = BEDROCK_DATA_PATH . '/enums';
public const ENUMS_PY = BEDROCK_DATA_PATH . '/enums.py'; public const ENUMS_PY = BEDROCK_DATA_PATH . '/enums.py';
public const ITEM_TAGS_JSON = BEDROCK_DATA_PATH . '/item_tags.json'; public const ITEM_TAGS_JSON = BEDROCK_DATA_PATH . '/item_tags.json';
public const LEVEL_SOUND_ID_MAP_JSON = BEDROCK_DATA_PATH . '/level_sound_id_map.json'; public const LEVEL_SOUND_ID_MAP_JSON = BEDROCK_DATA_PATH . '/level_sound_id_map.json';
public const PROTOCOL_INFO_JSON = BEDROCK_DATA_PATH . '/protocol_info.json'; public const PROTOCOL_INFO_JSON = BEDROCK_DATA_PATH . '/protocol_info.json';
public const R12_TO_CURRENT_BLOCK_MAP_BIN = BEDROCK_DATA_PATH . '/r12_to_current_block_map.bin'; public const R12_TO_CURRENT_BLOCK_MAP_BIN = BEDROCK_DATA_PATH . '/r12_to_current_block_map.bin';
public const R16_TO_CURRENT_ITEM_MAP_JSON = BEDROCK_DATA_PATH . '/r16_to_current_item_map.json'; public const R16_TO_CURRENT_ITEM_MAP_JSON = BEDROCK_DATA_PATH . '/r16_to_current_item_map.json';
public const RECIPES = BEDROCK_DATA_PATH . '/recipes';
public const REQUIRED_ITEM_LIST_JSON = BEDROCK_DATA_PATH . '/required_item_list.json'; public const REQUIRED_ITEM_LIST_JSON = BEDROCK_DATA_PATH . '/required_item_list.json';
} }

3
src/inventory/CreativeInventory.php
View File

@ -24,6 +24,7 @@ declare(strict_types=1);
namespace pocketmine\inventory; namespace pocketmine\inventory;
use pocketmine\crafting\CraftingManagerFromDataHelper; use pocketmine\crafting\CraftingManagerFromDataHelper;
use pocketmine\data\bedrock\BedrockDataFiles;
use pocketmine\inventory\json\CreativeGroupData; use pocketmine\inventory\json\CreativeGroupData;
use pocketmine\item\Item; use pocketmine\item\Item;
use pocketmine\lang\Translatable; use pocketmine\lang\Translatable;
@ -57,7 +58,7 @@ final class CreativeInventory{
"items" => CreativeCategory::ITEMS, "items" => CreativeCategory::ITEMS,
] as $categoryId => $categoryEnum){ ] as $categoryId => $categoryEnum){
$groups = CraftingManagerFromDataHelper::loadJsonArrayOfObjectsFile( $groups = CraftingManagerFromDataHelper::loadJsonArrayOfObjectsFile(
Path::join(\pocketmine\BEDROCK_DATA_PATH, "creative", $categoryId . ".json"), Path::join(BedrockDataFiles::CREATIVE, $categoryId . ".json"),
CreativeGroupData::class CreativeGroupData::class
); );