mirror of
https://github.com/pmmp/PocketMine-MP.git
synced 2025-09-07 02:08:21 +00:00
Merge branch 'minor-next' into major-next
This commit is contained in:
@ -45,6 +45,7 @@ final class BedrockDataFiles{
|
||||
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 PARTICLE_ID_MAP_JSON = BEDROCK_DATA_PATH . '/particle_id_map.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 R16_TO_CURRENT_ITEM_MAP_JSON = BEDROCK_DATA_PATH . '/r16_to_current_item_map.json';
|
||||
public const REQUIRED_ITEM_LIST_JSON = BEDROCK_DATA_PATH . '/required_item_list.json';
|
||||
|
@ -122,4 +122,5 @@ final class BiomeIds{
|
||||
public const DEEP_DARK = 190;
|
||||
public const MANGROVE_SWAMP = 191;
|
||||
public const CHERRY_GROVE = 192;
|
||||
public const PALE_GARDEN = 193;
|
||||
}
|
||||
|
@ -93,12 +93,17 @@ final class BlockStateNames{
|
||||
public const MC_VERTICAL_HALF = "minecraft:vertical_half";
|
||||
public const MOISTURIZED_AMOUNT = "moisturized_amount";
|
||||
public const MULTI_FACE_DIRECTION_BITS = "multi_face_direction_bits";
|
||||
public const NATURAL = "natural";
|
||||
public const OCCUPIED_BIT = "occupied_bit";
|
||||
public const OMINOUS = "ominous";
|
||||
public const OPEN_BIT = "open_bit";
|
||||
public const ORIENTATION = "orientation";
|
||||
public const OUTPUT_LIT_BIT = "output_lit_bit";
|
||||
public const OUTPUT_SUBTRACT_BIT = "output_subtract_bit";
|
||||
public const PALE_MOSS_CARPET_SIDE_EAST = "pale_moss_carpet_side_east";
|
||||
public const PALE_MOSS_CARPET_SIDE_NORTH = "pale_moss_carpet_side_north";
|
||||
public const PALE_MOSS_CARPET_SIDE_SOUTH = "pale_moss_carpet_side_south";
|
||||
public const PALE_MOSS_CARPET_SIDE_WEST = "pale_moss_carpet_side_west";
|
||||
public const PERSISTENT_BIT = "persistent_bit";
|
||||
public const PILLAR_AXIS = "pillar_axis";
|
||||
public const PORTAL_AXIS = "portal_axis";
|
||||
@ -116,6 +121,7 @@ final class BlockStateNames{
|
||||
public const STABILITY_CHECK = "stability_check";
|
||||
public const STRUCTURE_BLOCK_TYPE = "structure_block_type";
|
||||
public const SUSPENDED_BIT = "suspended_bit";
|
||||
public const TIP = "tip";
|
||||
public const TOGGLE_BIT = "toggle_bit";
|
||||
public const TORCH_FACING_DIRECTION = "torch_facing_direction";
|
||||
public const TRIAL_SPAWNER_STATE = "trial_spawner_state";
|
||||
|
@ -106,6 +106,22 @@ final class BlockStateStringValues{
|
||||
public const ORIENTATION_UP_WEST = "up_west";
|
||||
public const ORIENTATION_WEST_UP = "west_up";
|
||||
|
||||
public const PALE_MOSS_CARPET_SIDE_EAST_NONE = "none";
|
||||
public const PALE_MOSS_CARPET_SIDE_EAST_SHORT = "short";
|
||||
public const PALE_MOSS_CARPET_SIDE_EAST_TALL = "tall";
|
||||
|
||||
public const PALE_MOSS_CARPET_SIDE_NORTH_NONE = "none";
|
||||
public const PALE_MOSS_CARPET_SIDE_NORTH_SHORT = "short";
|
||||
public const PALE_MOSS_CARPET_SIDE_NORTH_TALL = "tall";
|
||||
|
||||
public const PALE_MOSS_CARPET_SIDE_SOUTH_NONE = "none";
|
||||
public const PALE_MOSS_CARPET_SIDE_SOUTH_SHORT = "short";
|
||||
public const PALE_MOSS_CARPET_SIDE_SOUTH_TALL = "tall";
|
||||
|
||||
public const PALE_MOSS_CARPET_SIDE_WEST_NONE = "none";
|
||||
public const PALE_MOSS_CARPET_SIDE_WEST_SHORT = "short";
|
||||
public const PALE_MOSS_CARPET_SIDE_WEST_TALL = "tall";
|
||||
|
||||
public const PILLAR_AXIS_X = "x";
|
||||
public const PILLAR_AXIS_Y = "y";
|
||||
public const PILLAR_AXIS_Z = "z";
|
||||
|
@ -192,6 +192,7 @@ final class BlockTypeNames{
|
||||
public const CAVE_VINES_HEAD_WITH_BERRIES = "minecraft:cave_vines_head_with_berries";
|
||||
public const CHAIN = "minecraft:chain";
|
||||
public const CHAIN_COMMAND_BLOCK = "minecraft:chain_command_block";
|
||||
public const CHALKBOARD = "minecraft:chalkboard";
|
||||
public const CHEMICAL_HEAT = "minecraft:chemical_heat";
|
||||
public const CHERRY_BUTTON = "minecraft:cherry_button";
|
||||
public const CHERRY_DOOR = "minecraft:cherry_door";
|
||||
@ -219,6 +220,7 @@ final class BlockTypeNames{
|
||||
public const CHISELED_POLISHED_BLACKSTONE = "minecraft:chiseled_polished_blackstone";
|
||||
public const CHISELED_QUARTZ_BLOCK = "minecraft:chiseled_quartz_block";
|
||||
public const CHISELED_RED_SANDSTONE = "minecraft:chiseled_red_sandstone";
|
||||
public const CHISELED_RESIN_BRICKS = "minecraft:chiseled_resin_bricks";
|
||||
public const CHISELED_SANDSTONE = "minecraft:chiseled_sandstone";
|
||||
public const CHISELED_STONE_BRICKS = "minecraft:chiseled_stone_bricks";
|
||||
public const CHISELED_TUFF = "minecraft:chiseled_tuff";
|
||||
@ -227,6 +229,7 @@ final class BlockTypeNames{
|
||||
public const CHORUS_PLANT = "minecraft:chorus_plant";
|
||||
public const CLAY = "minecraft:clay";
|
||||
public const CLIENT_REQUEST_PLACEHOLDER_BLOCK = "minecraft:client_request_placeholder_block";
|
||||
public const CLOSED_EYEBLOSSOM = "minecraft:closed_eyeblossom";
|
||||
public const COAL_BLOCK = "minecraft:coal_block";
|
||||
public const COAL_ORE = "minecraft:coal_ore";
|
||||
public const COARSE_DIRT = "minecraft:coarse_dirt";
|
||||
@ -262,6 +265,7 @@ final class BlockTypeNames{
|
||||
public const CRACKED_STONE_BRICKS = "minecraft:cracked_stone_bricks";
|
||||
public const CRAFTER = "minecraft:crafter";
|
||||
public const CRAFTING_TABLE = "minecraft:crafting_table";
|
||||
public const CREAKING_HEART = "minecraft:creaking_heart";
|
||||
public const CREEPER_HEAD = "minecraft:creeper_head";
|
||||
public const CRIMSON_BUTTON = "minecraft:crimson_button";
|
||||
public const CRIMSON_DOOR = "minecraft:crimson_door";
|
||||
@ -831,6 +835,7 @@ final class BlockTypeNames{
|
||||
public const OBSERVER = "minecraft:observer";
|
||||
public const OBSIDIAN = "minecraft:obsidian";
|
||||
public const OCHRE_FROGLIGHT = "minecraft:ochre_froglight";
|
||||
public const OPEN_EYEBLOSSOM = "minecraft:open_eyeblossom";
|
||||
public const ORANGE_CANDLE = "minecraft:orange_candle";
|
||||
public const ORANGE_CANDLE_CAKE = "minecraft:orange_candle_cake";
|
||||
public const ORANGE_CARPET = "minecraft:orange_carpet";
|
||||
@ -856,6 +861,26 @@ final class BlockTypeNames{
|
||||
public const OXIDIZED_DOUBLE_CUT_COPPER_SLAB = "minecraft:oxidized_double_cut_copper_slab";
|
||||
public const PACKED_ICE = "minecraft:packed_ice";
|
||||
public const PACKED_MUD = "minecraft:packed_mud";
|
||||
public const PALE_HANGING_MOSS = "minecraft:pale_hanging_moss";
|
||||
public const PALE_MOSS_BLOCK = "minecraft:pale_moss_block";
|
||||
public const PALE_MOSS_CARPET = "minecraft:pale_moss_carpet";
|
||||
public const PALE_OAK_BUTTON = "minecraft:pale_oak_button";
|
||||
public const PALE_OAK_DOOR = "minecraft:pale_oak_door";
|
||||
public const PALE_OAK_DOUBLE_SLAB = "minecraft:pale_oak_double_slab";
|
||||
public const PALE_OAK_FENCE = "minecraft:pale_oak_fence";
|
||||
public const PALE_OAK_FENCE_GATE = "minecraft:pale_oak_fence_gate";
|
||||
public const PALE_OAK_HANGING_SIGN = "minecraft:pale_oak_hanging_sign";
|
||||
public const PALE_OAK_LEAVES = "minecraft:pale_oak_leaves";
|
||||
public const PALE_OAK_LOG = "minecraft:pale_oak_log";
|
||||
public const PALE_OAK_PLANKS = "minecraft:pale_oak_planks";
|
||||
public const PALE_OAK_PRESSURE_PLATE = "minecraft:pale_oak_pressure_plate";
|
||||
public const PALE_OAK_SAPLING = "minecraft:pale_oak_sapling";
|
||||
public const PALE_OAK_SLAB = "minecraft:pale_oak_slab";
|
||||
public const PALE_OAK_STAIRS = "minecraft:pale_oak_stairs";
|
||||
public const PALE_OAK_STANDING_SIGN = "minecraft:pale_oak_standing_sign";
|
||||
public const PALE_OAK_TRAPDOOR = "minecraft:pale_oak_trapdoor";
|
||||
public const PALE_OAK_WALL_SIGN = "minecraft:pale_oak_wall_sign";
|
||||
public const PALE_OAK_WOOD = "minecraft:pale_oak_wood";
|
||||
public const PEARLESCENT_FROGLIGHT = "minecraft:pearlescent_froglight";
|
||||
public const PEONY = "minecraft:peony";
|
||||
public const PETRIFIED_OAK_DOUBLE_SLAB = "minecraft:petrified_oak_double_slab";
|
||||
@ -994,6 +1019,13 @@ final class BlockTypeNames{
|
||||
public const REINFORCED_DEEPSLATE = "minecraft:reinforced_deepslate";
|
||||
public const REPEATING_COMMAND_BLOCK = "minecraft:repeating_command_block";
|
||||
public const RESERVED6 = "minecraft:reserved6";
|
||||
public const RESIN_BLOCK = "minecraft:resin_block";
|
||||
public const RESIN_BRICK_DOUBLE_SLAB = "minecraft:resin_brick_double_slab";
|
||||
public const RESIN_BRICK_SLAB = "minecraft:resin_brick_slab";
|
||||
public const RESIN_BRICK_STAIRS = "minecraft:resin_brick_stairs";
|
||||
public const RESIN_BRICK_WALL = "minecraft:resin_brick_wall";
|
||||
public const RESIN_BRICKS = "minecraft:resin_bricks";
|
||||
public const RESIN_CLUMP = "minecraft:resin_clump";
|
||||
public const RESPAWN_ANCHOR = "minecraft:respawn_anchor";
|
||||
public const ROSE_BUSH = "minecraft:rose_bush";
|
||||
public const SAND = "minecraft:sand";
|
||||
@ -1096,6 +1128,8 @@ final class BlockTypeNames{
|
||||
public const STRIPPED_MANGROVE_WOOD = "minecraft:stripped_mangrove_wood";
|
||||
public const STRIPPED_OAK_LOG = "minecraft:stripped_oak_log";
|
||||
public const STRIPPED_OAK_WOOD = "minecraft:stripped_oak_wood";
|
||||
public const STRIPPED_PALE_OAK_LOG = "minecraft:stripped_pale_oak_log";
|
||||
public const STRIPPED_PALE_OAK_WOOD = "minecraft:stripped_pale_oak_wood";
|
||||
public const STRIPPED_SPRUCE_LOG = "minecraft:stripped_spruce_log";
|
||||
public const STRIPPED_SPRUCE_WOOD = "minecraft:stripped_spruce_wood";
|
||||
public const STRIPPED_WARPED_HYPHAE = "minecraft:stripped_warped_hyphae";
|
||||
|
@ -75,6 +75,7 @@ final class ItemTypeNames{
|
||||
public const BLEACH = "minecraft:bleach";
|
||||
public const BLUE_BUNDLE = "minecraft:blue_bundle";
|
||||
public const BLUE_DYE = "minecraft:blue_dye";
|
||||
public const BOARD = "minecraft:board";
|
||||
public const BOAT = "minecraft:boat";
|
||||
public const BOGGED_SPAWN_EGG = "minecraft:bogged_spawn_egg";
|
||||
public const BOLT_ARMOR_TRIM_SMITHING_TEMPLATE = "minecraft:bolt_armor_trim_smithing_template";
|
||||
@ -154,6 +155,7 @@ final class ItemTypeNames{
|
||||
public const CORAL_FAN = "minecraft:coral_fan";
|
||||
public const CORAL_FAN_DEAD = "minecraft:coral_fan_dead";
|
||||
public const COW_SPAWN_EGG = "minecraft:cow_spawn_egg";
|
||||
public const CREAKING_SPAWN_EGG = "minecraft:creaking_spawn_egg";
|
||||
public const CREEPER_BANNER_PATTERN = "minecraft:creeper_banner_pattern";
|
||||
public const CREEPER_SPAWN_EGG = "minecraft:creeper_spawn_egg";
|
||||
public const CRIMSON_DOOR = "minecraft:crimson_door";
|
||||
@ -398,6 +400,11 @@ final class ItemTypeNames{
|
||||
public const ORANGE_DYE = "minecraft:orange_dye";
|
||||
public const OXIDIZED_COPPER_DOOR = "minecraft:oxidized_copper_door";
|
||||
public const PAINTING = "minecraft:painting";
|
||||
public const PALE_OAK_BOAT = "minecraft:pale_oak_boat";
|
||||
public const PALE_OAK_CHEST_BOAT = "minecraft:pale_oak_chest_boat";
|
||||
public const PALE_OAK_DOOR = "minecraft:pale_oak_door";
|
||||
public const PALE_OAK_HANGING_SIGN = "minecraft:pale_oak_hanging_sign";
|
||||
public const PALE_OAK_SIGN = "minecraft:pale_oak_sign";
|
||||
public const PANDA_SPAWN_EGG = "minecraft:panda_spawn_egg";
|
||||
public const PAPER = "minecraft:paper";
|
||||
public const PARROT_SPAWN_EGG = "minecraft:parrot_spawn_egg";
|
||||
@ -448,6 +455,7 @@ final class ItemTypeNames{
|
||||
public const RED_FLOWER = "minecraft:red_flower";
|
||||
public const REDSTONE = "minecraft:redstone";
|
||||
public const REPEATER = "minecraft:repeater";
|
||||
public const RESIN_BRICK = "minecraft:resin_brick";
|
||||
public const RIB_ARMOR_TRIM_SMITHING_TEMPLATE = "minecraft:rib_armor_trim_smithing_template";
|
||||
public const ROTTEN_FLESH = "minecraft:rotten_flesh";
|
||||
public const SADDLE = "minecraft:saddle";
|
||||
|
Reference in New Issue
Block a user