diff --git a/src/pocketmine/Player.php b/src/pocketmine/Player.php index 71fbb29fe..ab735d62a 100644 --- a/src/pocketmine/Player.php +++ b/src/pocketmine/Player.php @@ -159,11 +159,11 @@ use pocketmine\utils\UUID; */ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{ - const SURVIVAL = 0; - const CREATIVE = 1; - const ADVENTURE = 2; - const SPECTATOR = 3; - const VIEW = Player::SPECTATOR; + public const SURVIVAL = 0; + public const CREATIVE = 1; + public const ADVENTURE = 2; + public const SPECTATOR = 3; + public const VIEW = Player::SPECTATOR; /** * Checks a supplied username and checks it is valid. diff --git a/src/pocketmine/Server.php b/src/pocketmine/Server.php index 32bea76e9..7a8f88810 100644 --- a/src/pocketmine/Server.php +++ b/src/pocketmine/Server.php @@ -115,8 +115,8 @@ use pocketmine\utils\VersionString; * The class that manages everything */ class Server{ - const BROADCAST_CHANNEL_ADMINISTRATIVE = "pocketmine.broadcast.admin"; - const BROADCAST_CHANNEL_USERS = "pocketmine.broadcast.user"; + public const BROADCAST_CHANNEL_ADMINISTRATIVE = "pocketmine.broadcast.admin"; + public const BROADCAST_CHANNEL_USERS = "pocketmine.broadcast.user"; /** @var Server */ private static $instance = null; diff --git a/src/pocketmine/block/Anvil.php b/src/pocketmine/block/Anvil.php index 603785ece..90111d3f2 100644 --- a/src/pocketmine/block/Anvil.php +++ b/src/pocketmine/block/Anvil.php @@ -33,9 +33,9 @@ use pocketmine\Player; class Anvil extends Fallable{ - const TYPE_NORMAL = 0; - const TYPE_SLIGHTLY_DAMAGED = 4; - const TYPE_VERY_DAMAGED = 8; + public const TYPE_NORMAL = 0; + public const TYPE_SLIGHTLY_DAMAGED = 4; + public const TYPE_VERY_DAMAGED = 8; protected $id = self::ANVIL; diff --git a/src/pocketmine/block/Bed.php b/src/pocketmine/block/Bed.php index c85edc910..e69b03642 100644 --- a/src/pocketmine/block/Bed.php +++ b/src/pocketmine/block/Bed.php @@ -35,8 +35,8 @@ use pocketmine\tile\Tile; use pocketmine\utils\TextFormat; class Bed extends Transparent{ - const BITFLAG_OCCUPIED = 0x04; - const BITFLAG_HEAD = 0x08; + public const BITFLAG_OCCUPIED = 0x04; + public const BITFLAG_HEAD = 0x08; protected $id = self::BED_BLOCK; diff --git a/src/pocketmine/block/BlockIds.php b/src/pocketmine/block/BlockIds.php index e7d04b86c..7edaca892 100644 --- a/src/pocketmine/block/BlockIds.php +++ b/src/pocketmine/block/BlockIds.php @@ -25,255 +25,255 @@ namespace pocketmine\block; interface BlockIds{ - const AIR = 0; - const STONE = 1; - const GRASS = 2; - const DIRT = 3; - const COBBLESTONE = 4; - const PLANKS = 5, WOODEN_PLANKS = 5; - const SAPLING = 6; - const BEDROCK = 7; - const FLOWING_WATER = 8; - const STILL_WATER = 9, WATER = 9; - const FLOWING_LAVA = 10; - const LAVA = 11, STILL_LAVA = 11; - const SAND = 12; - const GRAVEL = 13; - const GOLD_ORE = 14; - const IRON_ORE = 15; - const COAL_ORE = 16; - const LOG = 17, WOOD = 17; - const LEAVES = 18; - const SPONGE = 19; - const GLASS = 20; - const LAPIS_ORE = 21; - const LAPIS_BLOCK = 22; - const DISPENSER = 23; - const SANDSTONE = 24; - const NOTEBLOCK = 25, NOTE_BLOCK = 25; - const BED_BLOCK = 26; - const GOLDEN_RAIL = 27, POWERED_RAIL = 27; - const DETECTOR_RAIL = 28; - const STICKY_PISTON = 29; - const COBWEB = 30, WEB = 30; - const TALLGRASS = 31, TALL_GRASS = 31; - const DEADBUSH = 32, DEAD_BUSH = 32; - const PISTON = 33; - const PISTONARMCOLLISION = 34, PISTON_ARM_COLLISION = 34; - const WOOL = 35; + public const AIR = 0; + public const STONE = 1; + public const GRASS = 2; + public const DIRT = 3; + public const COBBLESTONE = 4; + public const PLANKS = 5, WOODEN_PLANKS = 5; + public const SAPLING = 6; + public const BEDROCK = 7; + public const FLOWING_WATER = 8; + public const STILL_WATER = 9, WATER = 9; + public const FLOWING_LAVA = 10; + public const LAVA = 11, STILL_LAVA = 11; + public const SAND = 12; + public const GRAVEL = 13; + public const GOLD_ORE = 14; + public const IRON_ORE = 15; + public const COAL_ORE = 16; + public const LOG = 17, WOOD = 17; + public const LEAVES = 18; + public const SPONGE = 19; + public const GLASS = 20; + public const LAPIS_ORE = 21; + public const LAPIS_BLOCK = 22; + public const DISPENSER = 23; + public const SANDSTONE = 24; + public const NOTEBLOCK = 25, NOTE_BLOCK = 25; + public const BED_BLOCK = 26; + public const GOLDEN_RAIL = 27, POWERED_RAIL = 27; + public const DETECTOR_RAIL = 28; + public const STICKY_PISTON = 29; + public const COBWEB = 30, WEB = 30; + public const TALLGRASS = 31, TALL_GRASS = 31; + public const DEADBUSH = 32, DEAD_BUSH = 32; + public const PISTON = 33; + public const PISTONARMCOLLISION = 34, PISTON_ARM_COLLISION = 34; + public const WOOL = 35; - const DANDELION = 37, YELLOW_FLOWER = 37; - const POPPY = 38, RED_FLOWER = 38; - const BROWN_MUSHROOM = 39; - const RED_MUSHROOM = 40; - const GOLD_BLOCK = 41; - const IRON_BLOCK = 42; - const DOUBLE_STONE_SLAB = 43; - const STONE_SLAB = 44; - const BRICK_BLOCK = 45; - const TNT = 46; - const BOOKSHELF = 47; - const MOSSY_COBBLESTONE = 48, MOSS_STONE = 48; - const OBSIDIAN = 49; - const TORCH = 50; - const FIRE = 51; - const MOB_SPAWNER = 52, MONSTER_SPAWNER = 52; - const OAK_STAIRS = 53, WOODEN_STAIRS = 53; - const CHEST = 54; - const REDSTONE_WIRE = 55; - const DIAMOND_ORE = 56; - const DIAMOND_BLOCK = 57; - const CRAFTING_TABLE = 58, WORKBENCH = 58; - const WHEAT_BLOCK = 59; - const FARMLAND = 60; - const FURNACE = 61; - const BURNING_FURNACE = 62, LIT_FURNACE = 62; - const SIGN_POST = 63, STANDING_SIGN = 63; - const OAK_DOOR_BLOCK = 64, WOODEN_DOOR_BLOCK = 64; - const LADDER = 65; - const RAIL = 66; - const COBBLESTONE_STAIRS = 67, STONE_STAIRS = 67; - const WALL_SIGN = 68; - const LEVER = 69; - const STONE_PRESSURE_PLATE = 70; - const IRON_DOOR_BLOCK = 71; - const WOODEN_PRESSURE_PLATE = 72; - const REDSTONE_ORE = 73; - const GLOWING_REDSTONE_ORE = 74, LIT_REDSTONE_ORE = 74; - const UNLIT_REDSTONE_TORCH = 75; - const LIT_REDSTONE_TORCH = 76, REDSTONE_TORCH = 76; - const STONE_BUTTON = 77; - const SNOW_LAYER = 78; - const ICE = 79; - const SNOW = 80, SNOW_BLOCK = 80; - const CACTUS = 81; - const CLAY_BLOCK = 82; - const REEDS_BLOCK = 83, SUGARCANE_BLOCK = 83; - const JUKEBOX = 84; - const FENCE = 85; - const PUMPKIN = 86; - const NETHERRACK = 87; - const SOUL_SAND = 88; - const GLOWSTONE = 89; - const PORTAL = 90; - const JACK_O_LANTERN = 91, LIT_PUMPKIN = 91; - const CAKE_BLOCK = 92; - const REPEATER_BLOCK = 93, UNPOWERED_REPEATER = 93; - const POWERED_REPEATER = 94; - const INVISIBLEBEDROCK = 95, INVISIBLE_BEDROCK = 95; - const TRAPDOOR = 96, WOODEN_TRAPDOOR = 96; - const MONSTER_EGG = 97; - const STONEBRICK = 98, STONE_BRICK = 98, STONE_BRICKS = 98; - const BROWN_MUSHROOM_BLOCK = 99; - const RED_MUSHROOM_BLOCK = 100; - const IRON_BARS = 101; - const GLASS_PANE = 102; - const MELON_BLOCK = 103; - const PUMPKIN_STEM = 104; - const MELON_STEM = 105; - const VINE = 106, VINES = 106; - const FENCE_GATE = 107, OAK_FENCE_GATE = 107; - const BRICK_STAIRS = 108; - const STONE_BRICK_STAIRS = 109; - const MYCELIUM = 110; - const LILY_PAD = 111, WATERLILY = 111, WATER_LILY = 111; - const NETHER_BRICK_BLOCK = 112; - const NETHER_BRICK_FENCE = 113; - const NETHER_BRICK_STAIRS = 114; - const NETHER_WART_PLANT = 115; - const ENCHANTING_TABLE = 116, ENCHANTMENT_TABLE = 116; - const BREWING_STAND_BLOCK = 117; - const CAULDRON_BLOCK = 118; - const END_PORTAL = 119; - const END_PORTAL_FRAME = 120; - const END_STONE = 121; - const DRAGON_EGG = 122; - const REDSTONE_LAMP = 123; - const LIT_REDSTONE_LAMP = 124; - const DROPPER = 125; - const ACTIVATOR_RAIL = 126; - const COCOA = 127, COCOA_BLOCK = 127; - const SANDSTONE_STAIRS = 128; - const EMERALD_ORE = 129; - const ENDER_CHEST = 130; - const TRIPWIRE_HOOK = 131; - const TRIPWIRE = 132, TRIP_WIRE = 132; - const EMERALD_BLOCK = 133; - const SPRUCE_STAIRS = 134; - const BIRCH_STAIRS = 135; - const JUNGLE_STAIRS = 136; - const COMMAND_BLOCK = 137; - const BEACON = 138; - const COBBLESTONE_WALL = 139, STONE_WALL = 139; - const FLOWER_POT_BLOCK = 140; - const CARROTS = 141, CARROT_BLOCK = 141; - const POTATOES = 142, POTATO_BLOCK = 142; - const WOODEN_BUTTON = 143; - const MOB_HEAD_BLOCK = 144, SKULL_BLOCK = 144; - const ANVIL = 145; - const TRAPPED_CHEST = 146; - const LIGHT_WEIGHTED_PRESSURE_PLATE = 147; - const HEAVY_WEIGHTED_PRESSURE_PLATE = 148; - const COMPARATOR_BLOCK = 149, UNPOWERED_COMPARATOR = 149; - const POWERED_COMPARATOR = 150; - const DAYLIGHT_DETECTOR = 151, DAYLIGHT_SENSOR = 151; - const REDSTONE_BLOCK = 152; - const NETHER_QUARTZ_ORE = 153, QUARTZ_ORE = 153; - const HOPPER_BLOCK = 154; - const QUARTZ_BLOCK = 155; - const QUARTZ_STAIRS = 156; - const DOUBLE_WOODEN_SLAB = 157; - const WOODEN_SLAB = 158; - const STAINED_CLAY = 159, STAINED_HARDENED_CLAY = 159, TERRACOTTA = 159; - const STAINED_GLASS_PANE = 160; - const LEAVES2 = 161; - const LOG2 = 162, WOOD2 = 162; - const ACACIA_STAIRS = 163; - const DARK_OAK_STAIRS = 164; - const SLIME = 165, SLIME_BLOCK = 165; + public const DANDELION = 37, YELLOW_FLOWER = 37; + public const POPPY = 38, RED_FLOWER = 38; + public const BROWN_MUSHROOM = 39; + public const RED_MUSHROOM = 40; + public const GOLD_BLOCK = 41; + public const IRON_BLOCK = 42; + public const DOUBLE_STONE_SLAB = 43; + public const STONE_SLAB = 44; + public const BRICK_BLOCK = 45; + public const TNT = 46; + public const BOOKSHELF = 47; + public const MOSSY_COBBLESTONE = 48, MOSS_STONE = 48; + public const OBSIDIAN = 49; + public const TORCH = 50; + public const FIRE = 51; + public const MOB_SPAWNER = 52, MONSTER_SPAWNER = 52; + public const OAK_STAIRS = 53, WOODEN_STAIRS = 53; + public const CHEST = 54; + public const REDSTONE_WIRE = 55; + public const DIAMOND_ORE = 56; + public const DIAMOND_BLOCK = 57; + public const CRAFTING_TABLE = 58, WORKBENCH = 58; + public const WHEAT_BLOCK = 59; + public const FARMLAND = 60; + public const FURNACE = 61; + public const BURNING_FURNACE = 62, LIT_FURNACE = 62; + public const SIGN_POST = 63, STANDING_SIGN = 63; + public const OAK_DOOR_BLOCK = 64, WOODEN_DOOR_BLOCK = 64; + public const LADDER = 65; + public const RAIL = 66; + public const COBBLESTONE_STAIRS = 67, STONE_STAIRS = 67; + public const WALL_SIGN = 68; + public const LEVER = 69; + public const STONE_PRESSURE_PLATE = 70; + public const IRON_DOOR_BLOCK = 71; + public const WOODEN_PRESSURE_PLATE = 72; + public const REDSTONE_ORE = 73; + public const GLOWING_REDSTONE_ORE = 74, LIT_REDSTONE_ORE = 74; + public const UNLIT_REDSTONE_TORCH = 75; + public const LIT_REDSTONE_TORCH = 76, REDSTONE_TORCH = 76; + public const STONE_BUTTON = 77; + public const SNOW_LAYER = 78; + public const ICE = 79; + public const SNOW = 80, SNOW_BLOCK = 80; + public const CACTUS = 81; + public const CLAY_BLOCK = 82; + public const REEDS_BLOCK = 83, SUGARCANE_BLOCK = 83; + public const JUKEBOX = 84; + public const FENCE = 85; + public const PUMPKIN = 86; + public const NETHERRACK = 87; + public const SOUL_SAND = 88; + public const GLOWSTONE = 89; + public const PORTAL = 90; + public const JACK_O_LANTERN = 91, LIT_PUMPKIN = 91; + public const CAKE_BLOCK = 92; + public const REPEATER_BLOCK = 93, UNPOWERED_REPEATER = 93; + public const POWERED_REPEATER = 94; + public const INVISIBLEBEDROCK = 95, INVISIBLE_BEDROCK = 95; + public const TRAPDOOR = 96, WOODEN_TRAPDOOR = 96; + public const MONSTER_EGG = 97; + public const STONEBRICK = 98, STONE_BRICK = 98, STONE_BRICKS = 98; + public const BROWN_MUSHROOM_BLOCK = 99; + public const RED_MUSHROOM_BLOCK = 100; + public const IRON_BARS = 101; + public const GLASS_PANE = 102; + public const MELON_BLOCK = 103; + public const PUMPKIN_STEM = 104; + public const MELON_STEM = 105; + public const VINE = 106, VINES = 106; + public const FENCE_GATE = 107, OAK_FENCE_GATE = 107; + public const BRICK_STAIRS = 108; + public const STONE_BRICK_STAIRS = 109; + public const MYCELIUM = 110; + public const LILY_PAD = 111, WATERLILY = 111, WATER_LILY = 111; + public const NETHER_BRICK_BLOCK = 112; + public const NETHER_BRICK_FENCE = 113; + public const NETHER_BRICK_STAIRS = 114; + public const NETHER_WART_PLANT = 115; + public const ENCHANTING_TABLE = 116, ENCHANTMENT_TABLE = 116; + public const BREWING_STAND_BLOCK = 117; + public const CAULDRON_BLOCK = 118; + public const END_PORTAL = 119; + public const END_PORTAL_FRAME = 120; + public const END_STONE = 121; + public const DRAGON_EGG = 122; + public const REDSTONE_LAMP = 123; + public const LIT_REDSTONE_LAMP = 124; + public const DROPPER = 125; + public const ACTIVATOR_RAIL = 126; + public const COCOA = 127, COCOA_BLOCK = 127; + public const SANDSTONE_STAIRS = 128; + public const EMERALD_ORE = 129; + public const ENDER_CHEST = 130; + public const TRIPWIRE_HOOK = 131; + public const TRIPWIRE = 132, TRIP_WIRE = 132; + public const EMERALD_BLOCK = 133; + public const SPRUCE_STAIRS = 134; + public const BIRCH_STAIRS = 135; + public const JUNGLE_STAIRS = 136; + public const COMMAND_BLOCK = 137; + public const BEACON = 138; + public const COBBLESTONE_WALL = 139, STONE_WALL = 139; + public const FLOWER_POT_BLOCK = 140; + public const CARROTS = 141, CARROT_BLOCK = 141; + public const POTATOES = 142, POTATO_BLOCK = 142; + public const WOODEN_BUTTON = 143; + public const MOB_HEAD_BLOCK = 144, SKULL_BLOCK = 144; + public const ANVIL = 145; + public const TRAPPED_CHEST = 146; + public const LIGHT_WEIGHTED_PRESSURE_PLATE = 147; + public const HEAVY_WEIGHTED_PRESSURE_PLATE = 148; + public const COMPARATOR_BLOCK = 149, UNPOWERED_COMPARATOR = 149; + public const POWERED_COMPARATOR = 150; + public const DAYLIGHT_DETECTOR = 151, DAYLIGHT_SENSOR = 151; + public const REDSTONE_BLOCK = 152; + public const NETHER_QUARTZ_ORE = 153, QUARTZ_ORE = 153; + public const HOPPER_BLOCK = 154; + public const QUARTZ_BLOCK = 155; + public const QUARTZ_STAIRS = 156; + public const DOUBLE_WOODEN_SLAB = 157; + public const WOODEN_SLAB = 158; + public const STAINED_CLAY = 159, STAINED_HARDENED_CLAY = 159, TERRACOTTA = 159; + public const STAINED_GLASS_PANE = 160; + public const LEAVES2 = 161; + public const LOG2 = 162, WOOD2 = 162; + public const ACACIA_STAIRS = 163; + public const DARK_OAK_STAIRS = 164; + public const SLIME = 165, SLIME_BLOCK = 165; - const IRON_TRAPDOOR = 167; - const PRISMARINE = 168; - const SEALANTERN = 169, SEA_LANTERN = 169; - const HAY_BALE = 170, HAY_BLOCK = 170; - const CARPET = 171; - const HARDENED_CLAY = 172; - const COAL_BLOCK = 173; - const PACKED_ICE = 174; - const DOUBLE_PLANT = 175; - const STANDING_BANNER = 176; - const WALL_BANNER = 177; - const DAYLIGHT_DETECTOR_INVERTED = 178, DAYLIGHT_SENSOR_INVERTED = 178; - const RED_SANDSTONE = 179; - const RED_SANDSTONE_STAIRS = 180; - const DOUBLE_STONE_SLAB2 = 181; - const STONE_SLAB2 = 182; - const SPRUCE_FENCE_GATE = 183; - const BIRCH_FENCE_GATE = 184; - const JUNGLE_FENCE_GATE = 185; - const DARK_OAK_FENCE_GATE = 186; - const ACACIA_FENCE_GATE = 187; - const REPEATING_COMMAND_BLOCK = 188; - const CHAIN_COMMAND_BLOCK = 189; + public const IRON_TRAPDOOR = 167; + public const PRISMARINE = 168; + public const SEALANTERN = 169, SEA_LANTERN = 169; + public const HAY_BALE = 170, HAY_BLOCK = 170; + public const CARPET = 171; + public const HARDENED_CLAY = 172; + public const COAL_BLOCK = 173; + public const PACKED_ICE = 174; + public const DOUBLE_PLANT = 175; + public const STANDING_BANNER = 176; + public const WALL_BANNER = 177; + public const DAYLIGHT_DETECTOR_INVERTED = 178, DAYLIGHT_SENSOR_INVERTED = 178; + public const RED_SANDSTONE = 179; + public const RED_SANDSTONE_STAIRS = 180; + public const DOUBLE_STONE_SLAB2 = 181; + public const STONE_SLAB2 = 182; + public const SPRUCE_FENCE_GATE = 183; + public const BIRCH_FENCE_GATE = 184; + public const JUNGLE_FENCE_GATE = 185; + public const DARK_OAK_FENCE_GATE = 186; + public const ACACIA_FENCE_GATE = 187; + public const REPEATING_COMMAND_BLOCK = 188; + public const CHAIN_COMMAND_BLOCK = 189; - const SPRUCE_DOOR_BLOCK = 193; - const BIRCH_DOOR_BLOCK = 194; - const JUNGLE_DOOR_BLOCK = 195; - const ACACIA_DOOR_BLOCK = 196; - const DARK_OAK_DOOR_BLOCK = 197; - const GRASS_PATH = 198; - const FRAME_BLOCK = 199, ITEM_FRAME_BLOCK = 199; - const CHORUS_FLOWER = 200; - const PURPUR_BLOCK = 201; + public const SPRUCE_DOOR_BLOCK = 193; + public const BIRCH_DOOR_BLOCK = 194; + public const JUNGLE_DOOR_BLOCK = 195; + public const ACACIA_DOOR_BLOCK = 196; + public const DARK_OAK_DOOR_BLOCK = 197; + public const GRASS_PATH = 198; + public const FRAME_BLOCK = 199, ITEM_FRAME_BLOCK = 199; + public const CHORUS_FLOWER = 200; + public const PURPUR_BLOCK = 201; - const PURPUR_STAIRS = 203; + public const PURPUR_STAIRS = 203; - const UNDYED_SHULKER_BOX = 205; - const END_BRICKS = 206; - const FROSTED_ICE = 207; - const END_ROD = 208; - const END_GATEWAY = 209; + public const UNDYED_SHULKER_BOX = 205; + public const END_BRICKS = 206; + public const FROSTED_ICE = 207; + public const END_ROD = 208; + public const END_GATEWAY = 209; - const MAGMA = 213; - const NETHER_WART_BLOCK = 214; - const RED_NETHER_BRICK = 215; - const BONE_BLOCK = 216; + public const MAGMA = 213; + public const NETHER_WART_BLOCK = 214; + public const RED_NETHER_BRICK = 215; + public const BONE_BLOCK = 216; - const SHULKER_BOX = 218; - const PURPLE_GLAZED_TERRACOTTA = 219; - const WHITE_GLAZED_TERRACOTTA = 220; - const ORANGE_GLAZED_TERRACOTTA = 221; - const MAGENTA_GLAZED_TERRACOTTA = 222; - const LIGHT_BLUE_GLAZED_TERRACOTTA = 223; - const YELLOW_GLAZED_TERRACOTTA = 224; - const LIME_GLAZED_TERRACOTTA = 225; - const PINK_GLAZED_TERRACOTTA = 226; - const GRAY_GLAZED_TERRACOTTA = 227; - const SILVER_GLAZED_TERRACOTTA = 228; - const CYAN_GLAZED_TERRACOTTA = 229; + public const SHULKER_BOX = 218; + public const PURPLE_GLAZED_TERRACOTTA = 219; + public const WHITE_GLAZED_TERRACOTTA = 220; + public const ORANGE_GLAZED_TERRACOTTA = 221; + public const MAGENTA_GLAZED_TERRACOTTA = 222; + public const LIGHT_BLUE_GLAZED_TERRACOTTA = 223; + public const YELLOW_GLAZED_TERRACOTTA = 224; + public const LIME_GLAZED_TERRACOTTA = 225; + public const PINK_GLAZED_TERRACOTTA = 226; + public const GRAY_GLAZED_TERRACOTTA = 227; + public const SILVER_GLAZED_TERRACOTTA = 228; + public const CYAN_GLAZED_TERRACOTTA = 229; - const BLUE_GLAZED_TERRACOTTA = 231; - const BROWN_GLAZED_TERRACOTTA = 232; - const GREEN_GLAZED_TERRACOTTA = 233; - const RED_GLAZED_TERRACOTTA = 234; - const BLACK_GLAZED_TERRACOTTA = 235; - const CONCRETE = 236; - const CONCRETEPOWDER = 237, CONCRETE_POWDER = 237; + public const BLUE_GLAZED_TERRACOTTA = 231; + public const BROWN_GLAZED_TERRACOTTA = 232; + public const GREEN_GLAZED_TERRACOTTA = 233; + public const RED_GLAZED_TERRACOTTA = 234; + public const BLACK_GLAZED_TERRACOTTA = 235; + public const CONCRETE = 236; + public const CONCRETEPOWDER = 237, CONCRETE_POWDER = 237; - const CHORUS_PLANT = 240; - const STAINED_GLASS = 241; + public const CHORUS_PLANT = 240; + public const STAINED_GLASS = 241; - const PODZOL = 243; - const BEETROOT_BLOCK = 244; - const STONECUTTER = 245; - const GLOWINGOBSIDIAN = 246, GLOWING_OBSIDIAN = 246; - const NETHERREACTOR = 247, NETHER_REACTOR = 247; - const INFO_UPDATE = 248; - const INFO_UPDATE2 = 249; - const MOVINGBLOCK = 250, MOVING_BLOCK = 250; - const OBSERVER = 251; - const STRUCTURE_BLOCK = 252; + public const PODZOL = 243; + public const BEETROOT_BLOCK = 244; + public const STONECUTTER = 245; + public const GLOWINGOBSIDIAN = 246, GLOWING_OBSIDIAN = 246; + public const NETHERREACTOR = 247, NETHER_REACTOR = 247; + public const INFO_UPDATE = 248; + public const INFO_UPDATE2 = 249; + public const MOVINGBLOCK = 250, MOVING_BLOCK = 250; + public const OBSERVER = 251; + public const STRUCTURE_BLOCK = 252; - const RESERVED6 = 255; + public const RESERVED6 = 255; } diff --git a/src/pocketmine/block/CobblestoneWall.php b/src/pocketmine/block/CobblestoneWall.php index 050c469b3..a56909460 100644 --- a/src/pocketmine/block/CobblestoneWall.php +++ b/src/pocketmine/block/CobblestoneWall.php @@ -28,8 +28,8 @@ use pocketmine\math\AxisAlignedBB; use pocketmine\math\Vector3; class CobblestoneWall extends Transparent{ - const NONE_MOSSY_WALL = 0; - const MOSSY_WALL = 1; + public const NONE_MOSSY_WALL = 0; + public const MOSSY_WALL = 1; protected $id = self::COBBLESTONE_WALL; diff --git a/src/pocketmine/block/DoublePlant.php b/src/pocketmine/block/DoublePlant.php index 6849ec67c..60835d46b 100644 --- a/src/pocketmine/block/DoublePlant.php +++ b/src/pocketmine/block/DoublePlant.php @@ -30,7 +30,7 @@ use pocketmine\math\Vector3; use pocketmine\Player; class DoublePlant extends Flowable{ - const BITFLAG_TOP = 0x08; + public const BITFLAG_TOP = 0x08; protected $id = self::DOUBLE_PLANT; diff --git a/src/pocketmine/block/Flower.php b/src/pocketmine/block/Flower.php index 2af9b69a5..869daaea9 100644 --- a/src/pocketmine/block/Flower.php +++ b/src/pocketmine/block/Flower.php @@ -29,15 +29,15 @@ use pocketmine\math\Vector3; use pocketmine\Player; class Flower extends Flowable{ - const TYPE_POPPY = 0; - const TYPE_BLUE_ORCHID = 1; - const TYPE_ALLIUM = 2; - const TYPE_AZURE_BLUET = 3; - const TYPE_RED_TULIP = 4; - const TYPE_ORANGE_TULIP = 5; - const TYPE_WHITE_TULIP = 6; - const TYPE_PINK_TULIP = 7; - const TYPE_OXEYE_DAISY = 8; + public const TYPE_POPPY = 0; + public const TYPE_BLUE_ORCHID = 1; + public const TYPE_ALLIUM = 2; + public const TYPE_AZURE_BLUET = 3; + public const TYPE_RED_TULIP = 4; + public const TYPE_ORANGE_TULIP = 5; + public const TYPE_WHITE_TULIP = 6; + public const TYPE_PINK_TULIP = 7; + public const TYPE_OXEYE_DAISY = 8; protected $id = self::RED_FLOWER; diff --git a/src/pocketmine/block/FlowerPot.php b/src/pocketmine/block/FlowerPot.php index 4be11ff9b..f9215b8a0 100644 --- a/src/pocketmine/block/FlowerPot.php +++ b/src/pocketmine/block/FlowerPot.php @@ -33,8 +33,8 @@ use pocketmine\tile\Tile; class FlowerPot extends Flowable{ - const STATE_EMPTY = 0; - const STATE_FULL = 1; + public const STATE_EMPTY = 0; + public const STATE_FULL = 1; protected $id = self::FLOWER_POT_BLOCK; protected $itemId = Item::FLOWER_POT; diff --git a/src/pocketmine/block/Leaves.php b/src/pocketmine/block/Leaves.php index 589cacf0f..f5e5267f1 100644 --- a/src/pocketmine/block/Leaves.php +++ b/src/pocketmine/block/Leaves.php @@ -32,12 +32,12 @@ use pocketmine\math\Vector3; use pocketmine\Player; class Leaves extends Transparent{ - const OAK = 0; - const SPRUCE = 1; - const BIRCH = 2; - const JUNGLE = 3; - const ACACIA = 0; - const DARK_OAK = 1; + public const OAK = 0; + public const SPRUCE = 1; + public const BIRCH = 2; + public const JUNGLE = 3; + public const ACACIA = 0; + public const DARK_OAK = 1; protected $id = self::LEAVES; protected $woodType = self::WOOD; diff --git a/src/pocketmine/block/Planks.php b/src/pocketmine/block/Planks.php index d6253dfa5..8fa7a46d8 100644 --- a/src/pocketmine/block/Planks.php +++ b/src/pocketmine/block/Planks.php @@ -26,12 +26,12 @@ namespace pocketmine\block; use pocketmine\item\Tool; class Planks extends Solid{ - const OAK = 0; - const SPRUCE = 1; - const BIRCH = 2; - const JUNGLE = 3; - const ACACIA = 4; - const DARK_OAK = 5; + public const OAK = 0; + public const SPRUCE = 1; + public const BIRCH = 2; + public const JUNGLE = 3; + public const ACACIA = 4; + public const DARK_OAK = 5; protected $id = self::WOODEN_PLANKS; diff --git a/src/pocketmine/block/Prismarine.php b/src/pocketmine/block/Prismarine.php index 0365d0499..db741e100 100644 --- a/src/pocketmine/block/Prismarine.php +++ b/src/pocketmine/block/Prismarine.php @@ -28,9 +28,9 @@ use pocketmine\item\Tool; class Prismarine extends Solid{ - const NORMAL = 0; - const DARK = 1; - const BRICKS = 2; + public const NORMAL = 0; + public const DARK = 1; + public const BRICKS = 2; protected $id = self::PRISMARINE; diff --git a/src/pocketmine/block/Quartz.php b/src/pocketmine/block/Quartz.php index be185303a..2964cbaaf 100644 --- a/src/pocketmine/block/Quartz.php +++ b/src/pocketmine/block/Quartz.php @@ -31,9 +31,9 @@ use pocketmine\Player; class Quartz extends Solid{ - const NORMAL = 0; - const CHISELED = 1; - const PILLAR = 2; + public const NORMAL = 0; + public const CHISELED = 1; + public const PILLAR = 2; protected $id = self::QUARTZ_BLOCK; diff --git a/src/pocketmine/block/Rail.php b/src/pocketmine/block/Rail.php index bd46412b1..bae4f462d 100644 --- a/src/pocketmine/block/Rail.php +++ b/src/pocketmine/block/Rail.php @@ -30,16 +30,16 @@ use pocketmine\Player; class Rail extends Flowable{ - const STRAIGHT_NORTH_SOUTH = 0; - const STRAIGHT_EAST_WEST = 1; - const ASCENDING_EAST = 2; - const ASCENDING_WEST = 3; - const ASCENDING_NORTH = 4; - const ASCENDING_SOUTH = 5; - const CURVE_SOUTHEAST = 6; - const CURVE_SOUTHWEST = 7; - const CURVE_NORTHWEST = 8; - const CURVE_NORTHEAST = 9; + public const STRAIGHT_NORTH_SOUTH = 0; + public const STRAIGHT_EAST_WEST = 1; + public const ASCENDING_EAST = 2; + public const ASCENDING_WEST = 3; + public const ASCENDING_NORTH = 4; + public const ASCENDING_SOUTH = 5; + public const CURVE_SOUTHEAST = 6; + public const CURVE_SOUTHWEST = 7; + public const CURVE_NORTHWEST = 8; + public const CURVE_NORTHEAST = 9; protected $id = self::RAIL; diff --git a/src/pocketmine/block/Sandstone.php b/src/pocketmine/block/Sandstone.php index 80f88d9fd..8b1b29c47 100644 --- a/src/pocketmine/block/Sandstone.php +++ b/src/pocketmine/block/Sandstone.php @@ -28,9 +28,9 @@ use pocketmine\item\Tool; class Sandstone extends Solid{ - const NORMAL = 0; - const CHISELED = 1; - const SMOOTH = 2; + public const NORMAL = 0; + public const CHISELED = 1; + public const SMOOTH = 2; protected $id = self::SANDSTONE; diff --git a/src/pocketmine/block/Sapling.php b/src/pocketmine/block/Sapling.php index 4fbbe3a87..df422132c 100644 --- a/src/pocketmine/block/Sapling.php +++ b/src/pocketmine/block/Sapling.php @@ -31,12 +31,12 @@ use pocketmine\Player; use pocketmine\utils\Random; class Sapling extends Flowable{ - const OAK = 0; - const SPRUCE = 1; - const BIRCH = 2; - const JUNGLE = 3; - const ACACIA = 4; - const DARK_OAK = 5; + public const OAK = 0; + public const SPRUCE = 1; + public const BIRCH = 2; + public const JUNGLE = 3; + public const ACACIA = 4; + public const DARK_OAK = 5; protected $id = self::SAPLING; diff --git a/src/pocketmine/block/Stone.php b/src/pocketmine/block/Stone.php index 751e16c5b..cf38f27e2 100644 --- a/src/pocketmine/block/Stone.php +++ b/src/pocketmine/block/Stone.php @@ -28,13 +28,13 @@ use pocketmine\item\ItemFactory; use pocketmine\item\Tool; class Stone extends Solid{ - const NORMAL = 0; - const GRANITE = 1; - const POLISHED_GRANITE = 2; - const DIORITE = 3; - const POLISHED_DIORITE = 4; - const ANDESITE = 5; - const POLISHED_ANDESITE = 6; + public const NORMAL = 0; + public const GRANITE = 1; + public const POLISHED_GRANITE = 2; + public const DIORITE = 3; + public const POLISHED_DIORITE = 4; + public const ANDESITE = 5; + public const POLISHED_ANDESITE = 6; protected $id = self::STONE; diff --git a/src/pocketmine/block/StoneBricks.php b/src/pocketmine/block/StoneBricks.php index d5b866236..f873f26ab 100644 --- a/src/pocketmine/block/StoneBricks.php +++ b/src/pocketmine/block/StoneBricks.php @@ -27,10 +27,10 @@ use pocketmine\item\Item; use pocketmine\item\Tool; class StoneBricks extends Solid{ - const NORMAL = 0; - const MOSSY = 1; - const CRACKED = 2; - const CHISELED = 3; + public const NORMAL = 0; + public const MOSSY = 1; + public const CRACKED = 2; + public const CHISELED = 3; protected $id = self::STONE_BRICKS; diff --git a/src/pocketmine/block/StoneSlab.php b/src/pocketmine/block/StoneSlab.php index c5bb9cbbd..df6a87d5b 100644 --- a/src/pocketmine/block/StoneSlab.php +++ b/src/pocketmine/block/StoneSlab.php @@ -27,14 +27,14 @@ use pocketmine\item\Item; use pocketmine\item\Tool; class StoneSlab extends Slab{ - const STONE = 0; - const SANDSTONE = 1; - const WOODEN = 2; - const COBBLESTONE = 3; - const BRICK = 4; - const STONE_BRICK = 5; - const QUARTZ = 6; - const NETHER_BRICK = 7; + public const STONE = 0; + public const SANDSTONE = 1; + public const WOODEN = 2; + public const COBBLESTONE = 3; + public const BRICK = 4; + public const STONE_BRICK = 5; + public const QUARTZ = 6; + public const NETHER_BRICK = 7; protected $id = self::STONE_SLAB; diff --git a/src/pocketmine/block/StoneSlab2.php b/src/pocketmine/block/StoneSlab2.php index e143c73ff..af07993a8 100644 --- a/src/pocketmine/block/StoneSlab2.php +++ b/src/pocketmine/block/StoneSlab2.php @@ -24,8 +24,8 @@ declare(strict_types=1); namespace pocketmine\block; class StoneSlab2 extends StoneSlab{ - const TYPE_RED_SANDSTONE = 0; - const TYPE_PURPUR = 1; + public const TYPE_RED_SANDSTONE = 0; + public const TYPE_PURPUR = 1; protected $id = self::STONE_SLAB2; diff --git a/src/pocketmine/block/Trapdoor.php b/src/pocketmine/block/Trapdoor.php index f73b2f1d1..560ab038a 100644 --- a/src/pocketmine/block/Trapdoor.php +++ b/src/pocketmine/block/Trapdoor.php @@ -31,13 +31,13 @@ use pocketmine\math\Vector3; use pocketmine\Player; class Trapdoor extends Transparent{ - const MASK_UPPER = 0x04; - const MASK_OPENED = 0x08; - const MASK_SIDE = 0x03; - const MASK_SIDE_SOUTH = 2; - const MASK_SIDE_NORTH = 3; - const MASK_SIDE_EAST = 0; - const MASK_SIDE_WEST = 1; + public const MASK_UPPER = 0x04; + public const MASK_OPENED = 0x08; + public const MASK_SIDE = 0x03; + public const MASK_SIDE_SOUTH = 2; + public const MASK_SIDE_NORTH = 3; + public const MASK_SIDE_EAST = 0; + public const MASK_SIDE_WEST = 1; protected $id = self::TRAPDOOR; diff --git a/src/pocketmine/block/Vine.php b/src/pocketmine/block/Vine.php index 9bd46697d..59ecd06ce 100644 --- a/src/pocketmine/block/Vine.php +++ b/src/pocketmine/block/Vine.php @@ -32,10 +32,10 @@ use pocketmine\math\Vector3; use pocketmine\Player; class Vine extends Flowable{ - const FLAG_SOUTH = 0x01; - const FLAG_WEST = 0x02; - const FLAG_NORTH = 0x04; - const FLAG_EAST = 0x08; + public const FLAG_SOUTH = 0x01; + public const FLAG_WEST = 0x02; + public const FLAG_NORTH = 0x04; + public const FLAG_EAST = 0x08; protected $id = self::VINE; diff --git a/src/pocketmine/block/Wood.php b/src/pocketmine/block/Wood.php index 02d3a0e00..750e0999f 100644 --- a/src/pocketmine/block/Wood.php +++ b/src/pocketmine/block/Wood.php @@ -30,10 +30,10 @@ use pocketmine\math\Vector3; use pocketmine\Player; class Wood extends Solid{ - const OAK = 0; - const SPRUCE = 1; - const BIRCH = 2; - const JUNGLE = 3; + public const OAK = 0; + public const SPRUCE = 1; + public const BIRCH = 2; + public const JUNGLE = 3; protected $id = self::WOOD; diff --git a/src/pocketmine/block/Wood2.php b/src/pocketmine/block/Wood2.php index 320caa928..f452aaef8 100644 --- a/src/pocketmine/block/Wood2.php +++ b/src/pocketmine/block/Wood2.php @@ -26,8 +26,8 @@ namespace pocketmine\block; class Wood2 extends Wood{ - const ACACIA = 0; - const DARK_OAK = 1; + public const ACACIA = 0; + public const DARK_OAK = 1; protected $id = self::WOOD2; diff --git a/src/pocketmine/block/WoodenFence.php b/src/pocketmine/block/WoodenFence.php index d48a462d3..7429f441d 100644 --- a/src/pocketmine/block/WoodenFence.php +++ b/src/pocketmine/block/WoodenFence.php @@ -26,12 +26,12 @@ namespace pocketmine\block; use pocketmine\item\Tool; class WoodenFence extends Fence{ - const FENCE_OAK = 0; - const FENCE_SPRUCE = 1; - const FENCE_BIRCH = 2; - const FENCE_JUNGLE = 3; - const FENCE_ACACIA = 4; - const FENCE_DARKOAK = 5; + public const FENCE_OAK = 0; + public const FENCE_SPRUCE = 1; + public const FENCE_BIRCH = 2; + public const FENCE_JUNGLE = 3; + public const FENCE_ACACIA = 4; + public const FENCE_DARKOAK = 5; protected $id = self::FENCE; diff --git a/src/pocketmine/command/CommandReader.php b/src/pocketmine/command/CommandReader.php index d0c201569..06f592eb5 100644 --- a/src/pocketmine/command/CommandReader.php +++ b/src/pocketmine/command/CommandReader.php @@ -27,9 +27,9 @@ use pocketmine\Thread; class CommandReader extends Thread{ - const TYPE_READLINE = 0; - const TYPE_STREAM = 1; - const TYPE_PIPED = 2; + public const TYPE_READLINE = 0; + public const TYPE_STREAM = 1; + public const TYPE_PIPED = 2; /** @var \Threaded */ protected $buffer; diff --git a/src/pocketmine/command/defaults/VanillaCommand.php b/src/pocketmine/command/defaults/VanillaCommand.php index 7b247acfd..af2c11e9c 100644 --- a/src/pocketmine/command/defaults/VanillaCommand.php +++ b/src/pocketmine/command/defaults/VanillaCommand.php @@ -27,8 +27,8 @@ use pocketmine\command\Command; use pocketmine\command\CommandSender; abstract class VanillaCommand extends Command{ - const MAX_COORD = 30000000; - const MIN_COORD = -30000000; + public const MAX_COORD = 30000000; + public const MIN_COORD = -30000000; /** * @param CommandSender $sender diff --git a/src/pocketmine/entity/Attribute.php b/src/pocketmine/entity/Attribute.php index 9fe208506..3a7284e00 100644 --- a/src/pocketmine/entity/Attribute.php +++ b/src/pocketmine/entity/Attribute.php @@ -25,18 +25,18 @@ namespace pocketmine\entity; class Attribute{ - const ABSORPTION = 0; - const SATURATION = 1; - const EXHAUSTION = 2; - const KNOCKBACK_RESISTANCE = 3; - const HEALTH = 4; - const MOVEMENT_SPEED = 5; - const FOLLOW_RANGE = 6; - const HUNGER = 7; - const FOOD = 7; - const ATTACK_DAMAGE = 8; - const EXPERIENCE_LEVEL = 9; - const EXPERIENCE = 10; + public const ABSORPTION = 0; + public const SATURATION = 1; + public const EXHAUSTION = 2; + public const KNOCKBACK_RESISTANCE = 3; + public const HEALTH = 4; + public const MOVEMENT_SPEED = 5; + public const FOLLOW_RANGE = 6; + public const HUNGER = 7; + public const FOOD = 7; + public const ATTACK_DAMAGE = 8; + public const EXPERIENCE_LEVEL = 9; + public const EXPERIENCE = 10; private $id; protected $minValue; diff --git a/src/pocketmine/entity/Effect.php b/src/pocketmine/entity/Effect.php index a61fa3265..46d73c0e2 100644 --- a/src/pocketmine/entity/Effect.php +++ b/src/pocketmine/entity/Effect.php @@ -33,30 +33,30 @@ use pocketmine\Player; use pocketmine\utils\Config; class Effect{ - const SPEED = 1; - const SLOWNESS = 2; - const HASTE = 3; - const FATIGUE = 4, MINING_FATIGUE = 4; - const STRENGTH = 5; - const INSTANT_HEALTH = 6, HEALING = 6; - const INSTANT_DAMAGE = 7, HARMING = 7; - const JUMP = 8; - const NAUSEA = 9, CONFUSION = 9; - const REGENERATION = 10; - const DAMAGE_RESISTANCE = 11; - const FIRE_RESISTANCE = 12; - const WATER_BREATHING = 13; - const INVISIBILITY = 14; - const BLINDNESS = 15; - const NIGHT_VISION = 16; - const HUNGER = 17; - const WEAKNESS = 18; - const POISON = 19; - const WITHER = 20; - const HEALTH_BOOST = 21; - const ABSORPTION = 22; - const SATURATION = 23; - const LEVITATION = 24; //TODO + public const SPEED = 1; + public const SLOWNESS = 2; + public const HASTE = 3; + public const FATIGUE = 4, MINING_FATIGUE = 4; + public const STRENGTH = 5; + public const INSTANT_HEALTH = 6, HEALING = 6; + public const INSTANT_DAMAGE = 7, HARMING = 7; + public const JUMP = 8; + public const NAUSEA = 9, CONFUSION = 9; + public const REGENERATION = 10; + public const DAMAGE_RESISTANCE = 11; + public const FIRE_RESISTANCE = 12; + public const WATER_BREATHING = 13; + public const INVISIBILITY = 14; + public const BLINDNESS = 15; + public const NIGHT_VISION = 16; + public const HUNGER = 17; + public const WEAKNESS = 18; + public const POISON = 19; + public const WITHER = 20; + public const HEALTH_BOOST = 21; + public const ABSORPTION = 22; + public const SATURATION = 23; + public const LEVITATION = 24; //TODO /** @var Effect[] */ protected static $effects = []; diff --git a/src/pocketmine/entity/Entity.php b/src/pocketmine/entity/Entity.php index f81034b97..3d4bd6a62 100644 --- a/src/pocketmine/entity/Entity.php +++ b/src/pocketmine/entity/Entity.php @@ -68,149 +68,149 @@ use pocketmine\Server; abstract class Entity extends Location implements Metadatable, EntityIds{ - const MOTION_THRESHOLD = 0.00001; + public const MOTION_THRESHOLD = 0.00001; - const NETWORK_ID = -1; + public const NETWORK_ID = -1; - const DATA_TYPE_BYTE = 0; - const DATA_TYPE_SHORT = 1; - const DATA_TYPE_INT = 2; - const DATA_TYPE_FLOAT = 3; - const DATA_TYPE_STRING = 4; - const DATA_TYPE_SLOT = 5; - const DATA_TYPE_POS = 6; - const DATA_TYPE_LONG = 7; - const DATA_TYPE_VECTOR3F = 8; + public const DATA_TYPE_BYTE = 0; + public const DATA_TYPE_SHORT = 1; + public const DATA_TYPE_INT = 2; + public const DATA_TYPE_FLOAT = 3; + public const DATA_TYPE_STRING = 4; + public const DATA_TYPE_SLOT = 5; + public const DATA_TYPE_POS = 6; + public const DATA_TYPE_LONG = 7; + public const DATA_TYPE_VECTOR3F = 8; - const DATA_FLAGS = 0; - const DATA_HEALTH = 1; //int (minecart/boat) - const DATA_VARIANT = 2; //int - const DATA_COLOR = 3, DATA_COLOUR = 3; //byte - const DATA_NAMETAG = 4; //string - const DATA_OWNER_EID = 5; //long - const DATA_TARGET_EID = 6; //long - const DATA_AIR = 7; //short - const DATA_POTION_COLOR = 8; //int (ARGB!) - const DATA_POTION_AMBIENT = 9; //byte + public const DATA_FLAGS = 0; + public const DATA_HEALTH = 1; //int (minecart/boat) + public const DATA_VARIANT = 2; //int + public const DATA_COLOR = 3, DATA_COLOUR = 3; //byte + public const DATA_NAMETAG = 4; //string + public const DATA_OWNER_EID = 5; //long + public const DATA_TARGET_EID = 6; //long + public const DATA_AIR = 7; //short + public const DATA_POTION_COLOR = 8; //int (ARGB!) + public const DATA_POTION_AMBIENT = 9; //byte /* 10 (byte) */ - const DATA_HURT_TIME = 11; //int (minecart/boat) - const DATA_HURT_DIRECTION = 12; //int (minecart/boat) - const DATA_PADDLE_TIME_LEFT = 13; //float - const DATA_PADDLE_TIME_RIGHT = 14; //float - const DATA_EXPERIENCE_VALUE = 15; //int (xp orb) - const DATA_MINECART_DISPLAY_BLOCK = 16; //int (id | (data << 16)) - const DATA_MINECART_DISPLAY_OFFSET = 17; //int - const DATA_MINECART_HAS_DISPLAY = 18; //byte (must be 1 for minecart to show block inside) + public const DATA_HURT_TIME = 11; //int (minecart/boat) + public const DATA_HURT_DIRECTION = 12; //int (minecart/boat) + public const DATA_PADDLE_TIME_LEFT = 13; //float + public const DATA_PADDLE_TIME_RIGHT = 14; //float + public const DATA_EXPERIENCE_VALUE = 15; //int (xp orb) + public const DATA_MINECART_DISPLAY_BLOCK = 16; //int (id | (data << 16)) + public const DATA_MINECART_DISPLAY_OFFSET = 17; //int + public const DATA_MINECART_HAS_DISPLAY = 18; //byte (must be 1 for minecart to show block inside) //TODO: add more properties - const DATA_ENDERMAN_HELD_ITEM_ID = 23; //short - const DATA_ENDERMAN_HELD_ITEM_DAMAGE = 24; //short - const DATA_ENTITY_AGE = 25; //short + public const DATA_ENDERMAN_HELD_ITEM_ID = 23; //short + public const DATA_ENDERMAN_HELD_ITEM_DAMAGE = 24; //short + public const DATA_ENTITY_AGE = 25; //short /* 27 (byte) player-specific flags * 28 (int) player "index"? * 29 (block coords) bed position */ - const DATA_FIREBALL_POWER_X = 30; //float - const DATA_FIREBALL_POWER_Y = 31; - const DATA_FIREBALL_POWER_Z = 32; + public const DATA_FIREBALL_POWER_X = 30; //float + public const DATA_FIREBALL_POWER_Y = 31; + public const DATA_FIREBALL_POWER_Z = 32; /* 33 (unknown) * 34 (float) fishing bobber * 35 (float) fishing bobber * 36 (float) fishing bobber */ - const DATA_POTION_AUX_VALUE = 37; //short - const DATA_LEAD_HOLDER_EID = 38; //long - const DATA_SCALE = 39; //float - const DATA_INTERACTIVE_TAG = 40; //string (button text) - const DATA_NPC_SKIN_ID = 41; //string - const DATA_URL_TAG = 42; //string - const DATA_MAX_AIR = 43; //short - const DATA_MARK_VARIANT = 44; //int + public const DATA_POTION_AUX_VALUE = 37; //short + public const DATA_LEAD_HOLDER_EID = 38; //long + public const DATA_SCALE = 39; //float + public const DATA_INTERACTIVE_TAG = 40; //string (button text) + public const DATA_NPC_SKIN_ID = 41; //string + public const DATA_URL_TAG = 42; //string + public const DATA_MAX_AIR = 43; //short + public const DATA_MARK_VARIANT = 44; //int /* 45 (byte) container stuff * 46 (int) container stuff * 47 (int) container stuff */ - const DATA_BLOCK_TARGET = 48; //block coords (ender crystal) - const DATA_WITHER_INVULNERABLE_TICKS = 49; //int - const DATA_WITHER_TARGET_1 = 50; //long - const DATA_WITHER_TARGET_2 = 51; //long - const DATA_WITHER_TARGET_3 = 52; //long + public const DATA_BLOCK_TARGET = 48; //block coords (ender crystal) + public const DATA_WITHER_INVULNERABLE_TICKS = 49; //int + public const DATA_WITHER_TARGET_1 = 50; //long + public const DATA_WITHER_TARGET_2 = 51; //long + public const DATA_WITHER_TARGET_3 = 52; //long /* 53 (short) */ - const DATA_BOUNDING_BOX_WIDTH = 54; //float - const DATA_BOUNDING_BOX_HEIGHT = 55; //float - const DATA_FUSE_LENGTH = 56; //int - const DATA_RIDER_SEAT_POSITION = 57; //vector3f - const DATA_RIDER_ROTATION_LOCKED = 58; //byte - const DATA_RIDER_MAX_ROTATION = 59; //float - const DATA_RIDER_MIN_ROTATION = 60; //float - const DATA_AREA_EFFECT_CLOUD_RADIUS = 61; //float - const DATA_AREA_EFFECT_CLOUD_WAITING = 62; //int - const DATA_AREA_EFFECT_CLOUD_PARTICLE_ID = 63; //int + public const DATA_BOUNDING_BOX_WIDTH = 54; //float + public const DATA_BOUNDING_BOX_HEIGHT = 55; //float + public const DATA_FUSE_LENGTH = 56; //int + public const DATA_RIDER_SEAT_POSITION = 57; //vector3f + public const DATA_RIDER_ROTATION_LOCKED = 58; //byte + public const DATA_RIDER_MAX_ROTATION = 59; //float + public const DATA_RIDER_MIN_ROTATION = 60; //float + public const DATA_AREA_EFFECT_CLOUD_RADIUS = 61; //float + public const DATA_AREA_EFFECT_CLOUD_WAITING = 62; //int + public const DATA_AREA_EFFECT_CLOUD_PARTICLE_ID = 63; //int /* 64 (int) shulker-related */ - const DATA_SHULKER_ATTACH_FACE = 65; //byte + public const DATA_SHULKER_ATTACH_FACE = 65; //byte /* 66 (short) shulker-related */ - const DATA_SHULKER_ATTACH_POS = 67; //block coords - const DATA_TRADING_PLAYER_EID = 68; //long + public const DATA_SHULKER_ATTACH_POS = 67; //block coords + public const DATA_TRADING_PLAYER_EID = 68; //long /* 70 (byte) command-block */ - const DATA_COMMAND_BLOCK_COMMAND = 71; //string - const DATA_COMMAND_BLOCK_LAST_OUTPUT = 72; //string - const DATA_COMMAND_BLOCK_TRACK_OUTPUT = 73; //byte - const DATA_CONTROLLING_RIDER_SEAT_NUMBER = 74; //byte - const DATA_STRENGTH = 75; //int - const DATA_MAX_STRENGTH = 76; //int + public const DATA_COMMAND_BLOCK_COMMAND = 71; //string + public const DATA_COMMAND_BLOCK_LAST_OUTPUT = 72; //string + public const DATA_COMMAND_BLOCK_TRACK_OUTPUT = 73; //byte + public const DATA_CONTROLLING_RIDER_SEAT_NUMBER = 74; //byte + public const DATA_STRENGTH = 75; //int + public const DATA_MAX_STRENGTH = 76; //int /* 77 (int) * 78 (int) */ - const DATA_FLAG_ONFIRE = 0; - const DATA_FLAG_SNEAKING = 1; - const DATA_FLAG_RIDING = 2; - const DATA_FLAG_SPRINTING = 3; - const DATA_FLAG_ACTION = 4; - const DATA_FLAG_INVISIBLE = 5; - const DATA_FLAG_TEMPTED = 6; - const DATA_FLAG_INLOVE = 7; - const DATA_FLAG_SADDLED = 8; - const DATA_FLAG_POWERED = 9; - const DATA_FLAG_IGNITED = 10; - const DATA_FLAG_BABY = 11; - const DATA_FLAG_CONVERTING = 12; - const DATA_FLAG_CRITICAL = 13; - const DATA_FLAG_CAN_SHOW_NAMETAG = 14; - const DATA_FLAG_ALWAYS_SHOW_NAMETAG = 15; - const DATA_FLAG_IMMOBILE = 16, DATA_FLAG_NO_AI = 16; - const DATA_FLAG_SILENT = 17; - const DATA_FLAG_WALLCLIMBING = 18; - const DATA_FLAG_CAN_CLIMB = 19; - const DATA_FLAG_SWIMMER = 20; - const DATA_FLAG_CAN_FLY = 21; - const DATA_FLAG_RESTING = 22; - const DATA_FLAG_SITTING = 23; - const DATA_FLAG_ANGRY = 24; - const DATA_FLAG_INTERESTED = 25; - const DATA_FLAG_CHARGED = 26; - const DATA_FLAG_TAMED = 27; - const DATA_FLAG_LEASHED = 28; - const DATA_FLAG_SHEARED = 29; - const DATA_FLAG_GLIDING = 30; - const DATA_FLAG_ELDER = 31; - const DATA_FLAG_MOVING = 32; - const DATA_FLAG_BREATHING = 33; - const DATA_FLAG_CHESTED = 34; - const DATA_FLAG_STACKABLE = 35; - const DATA_FLAG_SHOWBASE = 36; - const DATA_FLAG_REARING = 37; - const DATA_FLAG_VIBRATING = 38; - const DATA_FLAG_IDLING = 39; - const DATA_FLAG_EVOKER_SPELL = 40; - const DATA_FLAG_CHARGE_ATTACK = 41; - const DATA_FLAG_WASD_CONTROLLED = 42; - const DATA_FLAG_CAN_POWER_JUMP = 43; - const DATA_FLAG_LINGER = 44; - const DATA_FLAG_HAS_COLLISION = 45; - const DATA_FLAG_AFFECTED_BY_GRAVITY = 46; - const DATA_FLAG_FIRE_IMMUNE = 47; - const DATA_FLAG_DANCING = 48; + public const DATA_FLAG_ONFIRE = 0; + public const DATA_FLAG_SNEAKING = 1; + public const DATA_FLAG_RIDING = 2; + public const DATA_FLAG_SPRINTING = 3; + public const DATA_FLAG_ACTION = 4; + public const DATA_FLAG_INVISIBLE = 5; + public const DATA_FLAG_TEMPTED = 6; + public const DATA_FLAG_INLOVE = 7; + public const DATA_FLAG_SADDLED = 8; + public const DATA_FLAG_POWERED = 9; + public const DATA_FLAG_IGNITED = 10; + public const DATA_FLAG_BABY = 11; + public const DATA_FLAG_CONVERTING = 12; + public const DATA_FLAG_CRITICAL = 13; + public const DATA_FLAG_CAN_SHOW_NAMETAG = 14; + public const DATA_FLAG_ALWAYS_SHOW_NAMETAG = 15; + public const DATA_FLAG_IMMOBILE = 16, DATA_FLAG_NO_AI = 16; + public const DATA_FLAG_SILENT = 17; + public const DATA_FLAG_WALLCLIMBING = 18; + public const DATA_FLAG_CAN_CLIMB = 19; + public const DATA_FLAG_SWIMMER = 20; + public const DATA_FLAG_CAN_FLY = 21; + public const DATA_FLAG_RESTING = 22; + public const DATA_FLAG_SITTING = 23; + public const DATA_FLAG_ANGRY = 24; + public const DATA_FLAG_INTERESTED = 25; + public const DATA_FLAG_CHARGED = 26; + public const DATA_FLAG_TAMED = 27; + public const DATA_FLAG_LEASHED = 28; + public const DATA_FLAG_SHEARED = 29; + public const DATA_FLAG_GLIDING = 30; + public const DATA_FLAG_ELDER = 31; + public const DATA_FLAG_MOVING = 32; + public const DATA_FLAG_BREATHING = 33; + public const DATA_FLAG_CHESTED = 34; + public const DATA_FLAG_STACKABLE = 35; + public const DATA_FLAG_SHOWBASE = 36; + public const DATA_FLAG_REARING = 37; + public const DATA_FLAG_VIBRATING = 38; + public const DATA_FLAG_IDLING = 39; + public const DATA_FLAG_EVOKER_SPELL = 40; + public const DATA_FLAG_CHARGE_ATTACK = 41; + public const DATA_FLAG_WASD_CONTROLLED = 42; + public const DATA_FLAG_CAN_POWER_JUMP = 43; + public const DATA_FLAG_LINGER = 44; + public const DATA_FLAG_HAS_COLLISION = 45; + public const DATA_FLAG_AFFECTED_BY_GRAVITY = 46; + public const DATA_FLAG_FIRE_IMMUNE = 47; + public const DATA_FLAG_DANCING = 48; public static $entityCount = 1; /** @var Entity[] */ diff --git a/src/pocketmine/entity/EntityIds.php b/src/pocketmine/entity/EntityIds.php index c0074954d..90b0b222e 100644 --- a/src/pocketmine/entity/EntityIds.php +++ b/src/pocketmine/entity/EntityIds.php @@ -25,95 +25,95 @@ namespace pocketmine\entity; interface EntityIds{ - const CHICKEN = 10; - const COW = 11; - const PIG = 12; - const SHEEP = 13; - const WOLF = 14; - const VILLAGER = 15; - const MOOSHROOM = 16; - const SQUID = 17; - const RABBIT = 18; - const BAT = 19; - const IRON_GOLEM = 20; - const SNOW_GOLEM = 21; - const OCELOT = 22; - const HORSE = 23; - const DONKEY = 24; - const MULE = 25; - const SKELETON_HORSE = 26; - const ZOMBIE_HORSE = 27; - const POLAR_BEAR = 28; - const LLAMA = 29; - const PARROT = 30; + public const CHICKEN = 10; + public const COW = 11; + public const PIG = 12; + public const SHEEP = 13; + public const WOLF = 14; + public const VILLAGER = 15; + public const MOOSHROOM = 16; + public const SQUID = 17; + public const RABBIT = 18; + public const BAT = 19; + public const IRON_GOLEM = 20; + public const SNOW_GOLEM = 21; + public const OCELOT = 22; + public const HORSE = 23; + public const DONKEY = 24; + public const MULE = 25; + public const SKELETON_HORSE = 26; + public const ZOMBIE_HORSE = 27; + public const POLAR_BEAR = 28; + public const LLAMA = 29; + public const PARROT = 30; - const ZOMBIE = 32; - const CREEPER = 33; - const SKELETON = 34; - const SPIDER = 35; - const ZOMBIE_PIGMAN = 36; - const SLIME = 37; - const ENDERMAN = 38; - const SILVERFISH = 39; - const CAVE_SPIDER = 40; - const GHAST = 41; - const MAGMA_CUBE = 42; - const BLAZE = 43; - const ZOMBIE_VILLAGER = 44; - const WITCH = 45; - const STRAY = 46; - const HUSK = 47; - const WITHER_SKELETON = 48; - const GUARDIAN = 49; - const ELDER_GUARDIAN = 50; - const NPC = 51; - const WITHER = 52; - const ENDER_DRAGON = 53; - const SHULKER = 54; - const ENDERMITE = 55; - const LEARN_TO_CODE_MASCOT = 56; - const VINDICATOR = 57; + public const ZOMBIE = 32; + public const CREEPER = 33; + public const SKELETON = 34; + public const SPIDER = 35; + public const ZOMBIE_PIGMAN = 36; + public const SLIME = 37; + public const ENDERMAN = 38; + public const SILVERFISH = 39; + public const CAVE_SPIDER = 40; + public const GHAST = 41; + public const MAGMA_CUBE = 42; + public const BLAZE = 43; + public const ZOMBIE_VILLAGER = 44; + public const WITCH = 45; + public const STRAY = 46; + public const HUSK = 47; + public const WITHER_SKELETON = 48; + public const GUARDIAN = 49; + public const ELDER_GUARDIAN = 50; + public const NPC = 51; + public const WITHER = 52; + public const ENDER_DRAGON = 53; + public const SHULKER = 54; + public const ENDERMITE = 55; + public const LEARN_TO_CODE_MASCOT = 56; + public const VINDICATOR = 57; - const ARMOR_STAND = 61; - const TRIPOD_CAMERA = 62; - const PLAYER = 63; - const ITEM = 64; - const TNT = 65; - const FALLING_BLOCK = 66; - const MOVING_BLOCK = 67; - const XP_BOTTLE = 68; - const XP_ORB = 69; - const EYE_OF_ENDER_SIGNAL = 70; - const ENDER_CRYSTAL = 71; - const FIREWORKS_ROCKET = 72; + public const ARMOR_STAND = 61; + public const TRIPOD_CAMERA = 62; + public const PLAYER = 63; + public const ITEM = 64; + public const TNT = 65; + public const FALLING_BLOCK = 66; + public const MOVING_BLOCK = 67; + public const XP_BOTTLE = 68; + public const XP_ORB = 69; + public const EYE_OF_ENDER_SIGNAL = 70; + public const ENDER_CRYSTAL = 71; + public const FIREWORKS_ROCKET = 72; - const SHULKER_BULLET = 76; - const FISHING_HOOK = 77; - const CHALKBOARD = 78; - const DRAGON_FIREBALL = 79; - const ARROW = 80; - const SNOWBALL = 81; - const EGG = 82; - const PAINTING = 83; - const MINECART = 84; - const LARGE_FIREBALL = 85; - const SPLASH_POTION = 86; - const ENDER_PEARL = 87; - const LEASH_KNOT = 88; - const WITHER_SKULL = 89; - const BOAT = 90; - const WITHER_SKULL_DANGEROUS = 91; - const LIGHTNING_BOLT = 93; - const SMALL_FIREBALL = 94; - const AREA_EFFECT_CLOUD = 95; - const HOPPER_MINECART = 96; - const TNT_MINECART = 97; - const CHEST_MINECART = 98; + public const SHULKER_BULLET = 76; + public const FISHING_HOOK = 77; + public const CHALKBOARD = 78; + public const DRAGON_FIREBALL = 79; + public const ARROW = 80; + public const SNOWBALL = 81; + public const EGG = 82; + public const PAINTING = 83; + public const MINECART = 84; + public const LARGE_FIREBALL = 85; + public const SPLASH_POTION = 86; + public const ENDER_PEARL = 87; + public const LEASH_KNOT = 88; + public const WITHER_SKULL = 89; + public const BOAT = 90; + public const WITHER_SKULL_DANGEROUS = 91; + public const LIGHTNING_BOLT = 93; + public const SMALL_FIREBALL = 94; + public const AREA_EFFECT_CLOUD = 95; + public const HOPPER_MINECART = 96; + public const TNT_MINECART = 97; + public const CHEST_MINECART = 98; - const COMMAND_BLOCK_MINECART = 100; - const LINGERING_POTION = 101; - const LLAMA_SPIT = 102; - const EVOCATION_FANG = 103; - const EVOCATION_ILLAGER = 104; - const VEX = 105; + public const COMMAND_BLOCK_MINECART = 100; + public const LINGERING_POTION = 101; + public const LLAMA_SPIT = 102; + public const EVOCATION_FANG = 103; + public const EVOCATION_ILLAGER = 104; + public const VEX = 105; } \ No newline at end of file diff --git a/src/pocketmine/entity/FallingSand.php b/src/pocketmine/entity/FallingSand.php index 92be9c3d5..508d9cc37 100644 --- a/src/pocketmine/entity/FallingSand.php +++ b/src/pocketmine/entity/FallingSand.php @@ -34,7 +34,7 @@ use pocketmine\nbt\tag\ByteTag; use pocketmine\nbt\tag\IntTag; class FallingSand extends Entity{ - const NETWORK_ID = self::FALLING_BLOCK; + public const NETWORK_ID = self::FALLING_BLOCK; public $width = 0.98; public $height = 0.98; diff --git a/src/pocketmine/entity/Human.php b/src/pocketmine/entity/Human.php index 103116947..3ab5f1c62 100644 --- a/src/pocketmine/entity/Human.php +++ b/src/pocketmine/entity/Human.php @@ -44,12 +44,12 @@ use pocketmine\utils\UUID; class Human extends Creature implements ProjectileSource, InventoryHolder{ - const DATA_PLAYER_FLAG_SLEEP = 1; - const DATA_PLAYER_FLAG_DEAD = 2; //TODO: CHECK + public const DATA_PLAYER_FLAG_SLEEP = 1; + public const DATA_PLAYER_FLAG_DEAD = 2; //TODO: CHECK - const DATA_PLAYER_FLAGS = 27; + public const DATA_PLAYER_FLAGS = 27; - const DATA_PLAYER_BED_POSITION = 29; + public const DATA_PLAYER_BED_POSITION = 29; /** @var PlayerInventory */ protected $inventory; diff --git a/src/pocketmine/entity/Item.php b/src/pocketmine/entity/Item.php index c8174897a..039b921fa 100644 --- a/src/pocketmine/entity/Item.php +++ b/src/pocketmine/entity/Item.php @@ -33,7 +33,7 @@ use pocketmine\network\mcpe\protocol\TakeItemEntityPacket; use pocketmine\Player; class Item extends Entity{ - const NETWORK_ID = self::ITEM; + public const NETWORK_ID = self::ITEM; /** @var string */ protected $owner = ""; diff --git a/src/pocketmine/entity/PrimedTNT.php b/src/pocketmine/entity/PrimedTNT.php index 3b6489456..f2a361770 100644 --- a/src/pocketmine/entity/PrimedTNT.php +++ b/src/pocketmine/entity/PrimedTNT.php @@ -30,7 +30,7 @@ use pocketmine\nbt\tag\ShortTag; use pocketmine\network\mcpe\protocol\LevelEventPacket; class PrimedTNT extends Entity implements Explosive{ - const NETWORK_ID = self::TNT; + public const NETWORK_ID = self::TNT; public $width = 0.98; public $height = 0.98; diff --git a/src/pocketmine/entity/Squid.php b/src/pocketmine/entity/Squid.php index 64f44245b..e1c99022e 100644 --- a/src/pocketmine/entity/Squid.php +++ b/src/pocketmine/entity/Squid.php @@ -31,7 +31,7 @@ use pocketmine\math\Vector3; use pocketmine\network\mcpe\protocol\EntityEventPacket; class Squid extends WaterAnimal{ - const NETWORK_ID = self::SQUID; + public const NETWORK_ID = self::SQUID; public $width = 0.95; public $height = 0.95; diff --git a/src/pocketmine/entity/Villager.php b/src/pocketmine/entity/Villager.php index 87c3ab1d2..7e9618961 100644 --- a/src/pocketmine/entity/Villager.php +++ b/src/pocketmine/entity/Villager.php @@ -24,13 +24,13 @@ declare(strict_types=1); namespace pocketmine\entity; class Villager extends Creature implements NPC, Ageable{ - const PROFESSION_FARMER = 0; - const PROFESSION_LIBRARIAN = 1; - const PROFESSION_PRIEST = 2; - const PROFESSION_BLACKSMITH = 3; - const PROFESSION_BUTCHER = 4; + public const PROFESSION_FARMER = 0; + public const PROFESSION_LIBRARIAN = 1; + public const PROFESSION_PRIEST = 2; + public const PROFESSION_BLACKSMITH = 3; + public const PROFESSION_BUTCHER = 4; - const NETWORK_ID = self::VILLAGER; + public const NETWORK_ID = self::VILLAGER; public $width = 0.6; public $height = 1.8; diff --git a/src/pocketmine/entity/Zombie.php b/src/pocketmine/entity/Zombie.php index b55de9f17..27f445746 100644 --- a/src/pocketmine/entity/Zombie.php +++ b/src/pocketmine/entity/Zombie.php @@ -29,7 +29,7 @@ use pocketmine\item\ItemFactory; use pocketmine\Player; class Zombie extends Monster{ - const NETWORK_ID = self::ZOMBIE; + public const NETWORK_ID = self::ZOMBIE; public $width = 0.6; public $height = 1.8; diff --git a/src/pocketmine/entity/projectile/Arrow.php b/src/pocketmine/entity/projectile/Arrow.php index 39ba3b53d..c3839987c 100644 --- a/src/pocketmine/entity/projectile/Arrow.php +++ b/src/pocketmine/entity/projectile/Arrow.php @@ -33,7 +33,7 @@ use pocketmine\network\mcpe\protocol\TakeItemEntityPacket; use pocketmine\Player; class Arrow extends Projectile{ - const NETWORK_ID = self::ARROW; + public const NETWORK_ID = self::ARROW; public $width = 0.25; public $height = 0.25; diff --git a/src/pocketmine/entity/projectile/Egg.php b/src/pocketmine/entity/projectile/Egg.php index 6fdaab89c..afdc98dbf 100644 --- a/src/pocketmine/entity/projectile/Egg.php +++ b/src/pocketmine/entity/projectile/Egg.php @@ -24,7 +24,7 @@ declare(strict_types=1); namespace pocketmine\entity\projectile; class Egg extends Throwable{ - const NETWORK_ID = self::EGG; + public const NETWORK_ID = self::EGG; //TODO: spawn chickens on collision } \ No newline at end of file diff --git a/src/pocketmine/entity/projectile/Projectile.php b/src/pocketmine/entity/projectile/Projectile.php index 96b23deb1..964808fe9 100644 --- a/src/pocketmine/entity/projectile/Projectile.php +++ b/src/pocketmine/entity/projectile/Projectile.php @@ -37,7 +37,7 @@ use pocketmine\nbt\tag\CompoundTag; abstract class Projectile extends Entity{ - const DATA_SHOOTER_ID = 17; + public const DATA_SHOOTER_ID = 17; protected $damage = 0; diff --git a/src/pocketmine/entity/projectile/Snowball.php b/src/pocketmine/entity/projectile/Snowball.php index 6caf543cc..c5aa91939 100644 --- a/src/pocketmine/entity/projectile/Snowball.php +++ b/src/pocketmine/entity/projectile/Snowball.php @@ -24,6 +24,6 @@ declare(strict_types=1); namespace pocketmine\entity\projectile; class Snowball extends Throwable{ - const NETWORK_ID = self::SNOWBALL; + public const NETWORK_ID = self::SNOWBALL; } diff --git a/src/pocketmine/event/EventPriority.php b/src/pocketmine/event/EventPriority.php index 3a36fa8a1..0545b3d4d 100644 --- a/src/pocketmine/event/EventPriority.php +++ b/src/pocketmine/event/EventPriority.php @@ -37,29 +37,29 @@ abstract class EventPriority{ * Event call is of very low importance and should be ran first, to allow * other plugins to further customise the outcome */ - const LOWEST = 5; + public const LOWEST = 5; /** * Event call is of low importance */ - const LOW = 4; + public const LOW = 4; /** * Event call is neither important or unimportant, and may be ran normally */ - const NORMAL = 3; + public const NORMAL = 3; /** * Event call is of high importance */ - const HIGH = 2; + public const HIGH = 2; /** * Event call is critical and must have the final say in what happens * to the event */ - const HIGHEST = 1; + public const HIGHEST = 1; /** * Event is listened to purely for monitoring the outcome of an event. * * No modifications to the event should be made under this priority */ - const MONITOR = 0; + public const MONITOR = 0; } \ No newline at end of file diff --git a/src/pocketmine/event/entity/EntityDamageEvent.php b/src/pocketmine/event/entity/EntityDamageEvent.php index 0be966f2c..e9a36c13f 100644 --- a/src/pocketmine/event/entity/EntityDamageEvent.php +++ b/src/pocketmine/event/entity/EntityDamageEvent.php @@ -32,29 +32,29 @@ use pocketmine\event\Cancellable; class EntityDamageEvent extends EntityEvent implements Cancellable{ public static $handlerList = null; - const MODIFIER_BASE = 0; - const MODIFIER_ARMOR = 1; - const MODIFIER_STRENGTH = 2; - const MODIFIER_WEAKNESS = 3; - const MODIFIER_RESISTANCE = 4; - const MODIFIER_ABSORPTION = 5; + public const MODIFIER_BASE = 0; + public const MODIFIER_ARMOR = 1; + public const MODIFIER_STRENGTH = 2; + public const MODIFIER_WEAKNESS = 3; + public const MODIFIER_RESISTANCE = 4; + public const MODIFIER_ABSORPTION = 5; - const CAUSE_CONTACT = 0; - const CAUSE_ENTITY_ATTACK = 1; - const CAUSE_PROJECTILE = 2; - const CAUSE_SUFFOCATION = 3; - const CAUSE_FALL = 4; - const CAUSE_FIRE = 5; - const CAUSE_FIRE_TICK = 6; - const CAUSE_LAVA = 7; - const CAUSE_DROWNING = 8; - const CAUSE_BLOCK_EXPLOSION = 9; - const CAUSE_ENTITY_EXPLOSION = 10; - const CAUSE_VOID = 11; - const CAUSE_SUICIDE = 12; - const CAUSE_MAGIC = 13; - const CAUSE_CUSTOM = 14; - const CAUSE_STARVATION = 15; + public const CAUSE_CONTACT = 0; + public const CAUSE_ENTITY_ATTACK = 1; + public const CAUSE_PROJECTILE = 2; + public const CAUSE_SUFFOCATION = 3; + public const CAUSE_FALL = 4; + public const CAUSE_FIRE = 5; + public const CAUSE_FIRE_TICK = 6; + public const CAUSE_LAVA = 7; + public const CAUSE_DROWNING = 8; + public const CAUSE_BLOCK_EXPLOSION = 9; + public const CAUSE_ENTITY_EXPLOSION = 10; + public const CAUSE_VOID = 11; + public const CAUSE_SUICIDE = 12; + public const CAUSE_MAGIC = 13; + public const CAUSE_CUSTOM = 14; + public const CAUSE_STARVATION = 15; /** @var int */ private $cause; diff --git a/src/pocketmine/event/entity/EntityRegainHealthEvent.php b/src/pocketmine/event/entity/EntityRegainHealthEvent.php index ad083cf5f..b484a1dad 100644 --- a/src/pocketmine/event/entity/EntityRegainHealthEvent.php +++ b/src/pocketmine/event/entity/EntityRegainHealthEvent.php @@ -29,11 +29,11 @@ use pocketmine\event\Cancellable; class EntityRegainHealthEvent extends EntityEvent implements Cancellable{ public static $handlerList = null; - const CAUSE_REGEN = 0; - const CAUSE_EATING = 1; - const CAUSE_MAGIC = 2; - const CAUSE_CUSTOM = 3; - const CAUSE_SATURATION = 4; + public const CAUSE_REGEN = 0; + public const CAUSE_EATING = 1; + public const CAUSE_MAGIC = 2; + public const CAUSE_CUSTOM = 3; + public const CAUSE_SATURATION = 4; /** @var float */ private $amount; diff --git a/src/pocketmine/event/player/PlayerAnimationEvent.php b/src/pocketmine/event/player/PlayerAnimationEvent.php index f899985f3..73238dd0b 100644 --- a/src/pocketmine/event/player/PlayerAnimationEvent.php +++ b/src/pocketmine/event/player/PlayerAnimationEvent.php @@ -36,7 +36,7 @@ class PlayerAnimationEvent extends PlayerEvent implements Cancellable{ * @deprecated This is dependent on the protocol and should not be here. * Use the constants in {@link pocketmine\network\mcpe\protocol\AnimatePacket} instead. */ - const ARM_SWING = 1; + public const ARM_SWING = 1; /** @var int */ private $animationType; diff --git a/src/pocketmine/event/player/PlayerEditBookEvent.php b/src/pocketmine/event/player/PlayerEditBookEvent.php index fa335c222..d1c8ffea9 100644 --- a/src/pocketmine/event/player/PlayerEditBookEvent.php +++ b/src/pocketmine/event/player/PlayerEditBookEvent.php @@ -30,11 +30,11 @@ use pocketmine\Player; class PlayerEditBookEvent extends PlayerEvent implements Cancellable{ public static $handlerList = null; - const ACTION_REPLACE_PAGE = 0; - const ACTION_ADD_PAGE = 1; - const ACTION_DELETE_PAGE = 2; - const ACTION_SWAP_PAGES = 3; - const ACTION_SIGN_BOOK = 4; + public const ACTION_REPLACE_PAGE = 0; + public const ACTION_ADD_PAGE = 1; + public const ACTION_DELETE_PAGE = 2; + public const ACTION_SWAP_PAGES = 3; + public const ACTION_SIGN_BOOK = 4; /** @var WritableBook */ private $oldBook; diff --git a/src/pocketmine/event/player/PlayerExhaustEvent.php b/src/pocketmine/event/player/PlayerExhaustEvent.php index abaa0c3d2..8e75324a6 100644 --- a/src/pocketmine/event/player/PlayerExhaustEvent.php +++ b/src/pocketmine/event/player/PlayerExhaustEvent.php @@ -30,17 +30,17 @@ use pocketmine\event\entity\EntityEvent; class PlayerExhaustEvent extends EntityEvent implements Cancellable{ public static $handlerList = null; - const CAUSE_ATTACK = 1; - const CAUSE_DAMAGE = 2; - const CAUSE_MINING = 3; - const CAUSE_HEALTH_REGEN = 4; - const CAUSE_POTION = 5; - const CAUSE_WALKING = 6; - const CAUSE_SPRINTING = 7; - const CAUSE_SWIMMING = 8; - const CAUSE_JUMPING = 9; - const CAUSE_SPRINT_JUMPING = 10; - const CAUSE_CUSTOM = 11; + public const CAUSE_ATTACK = 1; + public const CAUSE_DAMAGE = 2; + public const CAUSE_MINING = 3; + public const CAUSE_HEALTH_REGEN = 4; + public const CAUSE_POTION = 5; + public const CAUSE_WALKING = 6; + public const CAUSE_SPRINTING = 7; + public const CAUSE_SWIMMING = 8; + public const CAUSE_JUMPING = 9; + public const CAUSE_SPRINT_JUMPING = 10; + public const CAUSE_CUSTOM = 11; /** @var float */ private $amount; diff --git a/src/pocketmine/event/player/PlayerInteractEvent.php b/src/pocketmine/event/player/PlayerInteractEvent.php index 2de6c4565..8618d1333 100644 --- a/src/pocketmine/event/player/PlayerInteractEvent.php +++ b/src/pocketmine/event/player/PlayerInteractEvent.php @@ -37,11 +37,11 @@ use pocketmine\Player; class PlayerInteractEvent extends PlayerEvent implements Cancellable{ public static $handlerList = null; - const LEFT_CLICK_BLOCK = 0; - const RIGHT_CLICK_BLOCK = 1; - const LEFT_CLICK_AIR = 2; - const RIGHT_CLICK_AIR = 3; - const PHYSICAL = 4; + public const LEFT_CLICK_BLOCK = 0; + public const RIGHT_CLICK_BLOCK = 1; + public const LEFT_CLICK_AIR = 2; + public const RIGHT_CLICK_AIR = 3; + public const PHYSICAL = 4; /** @var Block */ protected $blockTouched; diff --git a/src/pocketmine/event/server/QueryRegenerateEvent.php b/src/pocketmine/event/server/QueryRegenerateEvent.php index 574b82ffe..804cf2553 100644 --- a/src/pocketmine/event/server/QueryRegenerateEvent.php +++ b/src/pocketmine/event/server/QueryRegenerateEvent.php @@ -31,7 +31,7 @@ use pocketmine\utils\Binary; class QueryRegenerateEvent extends ServerEvent{ public static $handlerList = null; - const GAME_ID = "MINECRAFTPE"; + public const GAME_ID = "MINECRAFTPE"; /** @var int */ private $timeout; diff --git a/src/pocketmine/inventory/Inventory.php b/src/pocketmine/inventory/Inventory.php index bbdb57027..37e7ecf48 100644 --- a/src/pocketmine/inventory/Inventory.php +++ b/src/pocketmine/inventory/Inventory.php @@ -30,7 +30,7 @@ use pocketmine\item\Item; use pocketmine\Player; interface Inventory{ - const MAX_STACK = 64; + public const MAX_STACK = 64; /** * @return int diff --git a/src/pocketmine/inventory/MultiRecipe.php b/src/pocketmine/inventory/MultiRecipe.php index c63cbbb1e..c668813a9 100644 --- a/src/pocketmine/inventory/MultiRecipe.php +++ b/src/pocketmine/inventory/MultiRecipe.php @@ -26,14 +26,14 @@ namespace pocketmine\inventory; use pocketmine\utils\UUID; class MultiRecipe{ - const TYPE_REPAIR_ITEM = "00000000-0000-0000-0000-000000000001"; - const TYPE_MAP_EXTENDING = "D392B075-4BA1-40AE-8789-AF868D56F6CE"; - const TYPE_MAP_CLONING = "85939755-BA10-4D9D-A4CC-EFB7A8E943C4"; - const TYPE_MAP_UPGRADING = "AECD2294-4B94-434B-8667-4499BB2C9327"; - const TYPE_BOOK_CLONING = "D1CA6B84-338E-4F2F-9C6B-76CC8B4BD98D"; - const TYPE_BANNER_DUPLICATE = "B5C5D105-75A2-4076-AF2B-923EA2BF4BF0"; - const TYPE_BANNER_ADD_PATTERN = "D81AAEAF-E172-4440-9225-868DF030D27B"; - const TYPE_FIREWORKS = "00000000-0000-0000-0000-000000000002"; + public const TYPE_REPAIR_ITEM = "00000000-0000-0000-0000-000000000001"; + public const TYPE_MAP_EXTENDING = "D392B075-4BA1-40AE-8789-AF868D56F6CE"; + public const TYPE_MAP_CLONING = "85939755-BA10-4D9D-A4CC-EFB7A8E943C4"; + public const TYPE_MAP_UPGRADING = "AECD2294-4B94-434B-8667-4499BB2C9327"; + public const TYPE_BOOK_CLONING = "D1CA6B84-338E-4F2F-9C6B-76CC8B4BD98D"; + public const TYPE_BANNER_DUPLICATE = "B5C5D105-75A2-4076-AF2B-923EA2BF4BF0"; + public const TYPE_BANNER_ADD_PATTERN = "D81AAEAF-E172-4440-9225-868DF030D27B"; + public const TYPE_FIREWORKS = "00000000-0000-0000-0000-000000000002"; private $uuid; diff --git a/src/pocketmine/inventory/transaction/action/CreativeInventoryAction.php b/src/pocketmine/inventory/transaction/action/CreativeInventoryAction.php index a28156433..7ad3ff0d4 100644 --- a/src/pocketmine/inventory/transaction/action/CreativeInventoryAction.php +++ b/src/pocketmine/inventory/transaction/action/CreativeInventoryAction.php @@ -31,11 +31,11 @@ class CreativeInventoryAction extends InventoryAction{ /** * Player put an item into the creative window to destroy it. */ - const TYPE_DELETE_ITEM = 0; + public const TYPE_DELETE_ITEM = 0; /** * Player took an item from the creative window. */ - const TYPE_CREATE_ITEM = 1; + public const TYPE_CREATE_ITEM = 1; protected $actionType; diff --git a/src/pocketmine/item/Banner.php b/src/pocketmine/item/Banner.php index 342615f03..819d9c19b 100644 --- a/src/pocketmine/item/Banner.php +++ b/src/pocketmine/item/Banner.php @@ -32,10 +32,10 @@ use pocketmine\nbt\tag\StringTag; use pocketmine\tile\Banner as TileBanner; class Banner extends Item{ - const TAG_BASE = TileBanner::TAG_BASE; - const TAG_PATTERNS = TileBanner::TAG_PATTERNS; - const TAG_PATTERN_COLOR = TileBanner::TAG_PATTERN_COLOR; - const TAG_PATTERN_NAME = TileBanner::TAG_PATTERN_NAME; + public const TAG_BASE = TileBanner::TAG_BASE; + public const TAG_PATTERNS = TileBanner::TAG_PATTERNS; + public const TAG_PATTERN_COLOR = TileBanner::TAG_PATTERN_COLOR; + public const TAG_PATTERN_NAME = TileBanner::TAG_PATTERN_NAME; public function __construct(int $meta = 0){ $this->block = BlockFactory::get(Block::STANDING_BANNER); diff --git a/src/pocketmine/item/Fish.php b/src/pocketmine/item/Fish.php index cbc41526c..42234f232 100644 --- a/src/pocketmine/item/Fish.php +++ b/src/pocketmine/item/Fish.php @@ -26,10 +26,10 @@ namespace pocketmine\item; use pocketmine\entity\Effect; class Fish extends Food{ - const FISH_FISH = 0; - const FISH_SALMON = 1; - const FISH_CLOWNFISH = 2; - const FISH_PUFFERFISH = 3; + public const FISH_FISH = 0; + public const FISH_SALMON = 1; + public const FISH_CLOWNFISH = 2; + public const FISH_PUFFERFISH = 3; public function __construct(int $meta = 0){ $name = "Raw Fish"; diff --git a/src/pocketmine/item/Item.php b/src/pocketmine/item/Item.php index c9c4c3962..88b82f070 100644 --- a/src/pocketmine/item/Item.php +++ b/src/pocketmine/item/Item.php @@ -45,12 +45,12 @@ use pocketmine\utils\Binary; use pocketmine\utils\Config; class Item implements ItemIds, \JsonSerializable{ - const TAG_ENCH = "ench"; - const TAG_DISPLAY = "display"; - const TAG_BLOCK_ENTITY_TAG = "BlockEntityTag"; + public const TAG_ENCH = "ench"; + public const TAG_DISPLAY = "display"; + public const TAG_BLOCK_ENTITY_TAG = "BlockEntityTag"; - const TAG_DISPLAY_NAME = "Name"; - const TAG_DISPLAY_LORE = "Lore"; + public const TAG_DISPLAY_NAME = "Name"; + public const TAG_DISPLAY_LORE = "Lore"; /** @var NBT */ diff --git a/src/pocketmine/item/ItemIds.php b/src/pocketmine/item/ItemIds.php index 40f2bcd26..00dc23bd7 100644 --- a/src/pocketmine/item/ItemIds.php +++ b/src/pocketmine/item/ItemIds.php @@ -27,219 +27,219 @@ use pocketmine\block\BlockIds; interface ItemIds extends BlockIds{ - const IRON_SHOVEL = 256; - const IRON_PICKAXE = 257; - const IRON_AXE = 258; - const FLINT_AND_STEEL = 259, FLINT_STEEL = 259; - const APPLE = 260; - const BOW = 261; - const ARROW = 262; - const COAL = 263; - const DIAMOND = 264; - const IRON_INGOT = 265; - const GOLD_INGOT = 266; - const IRON_SWORD = 267; - const WOODEN_SWORD = 268; - const WOODEN_SHOVEL = 269; - const WOODEN_PICKAXE = 270; - const WOODEN_AXE = 271; - const STONE_SWORD = 272; - const STONE_SHOVEL = 273; - const STONE_PICKAXE = 274; - const STONE_AXE = 275; - const DIAMOND_SWORD = 276; - const DIAMOND_SHOVEL = 277; - const DIAMOND_PICKAXE = 278; - const DIAMOND_AXE = 279; - const STICK = 280; - const BOWL = 281; - const MUSHROOM_STEW = 282; - const GOLDEN_SWORD = 283, GOLD_SWORD = 283; - const GOLDEN_SHOVEL = 284, GOLD_SHOVEL = 284; - const GOLDEN_PICKAXE = 285, GOLD_PICKAXE = 285; - const GOLDEN_AXE = 286, GOLD_AXE = 286; - const STRING = 287; - const FEATHER = 288; - const GUNPOWDER = 289; - const WOODEN_HOE = 290; - const STONE_HOE = 291; - const IRON_HOE = 292; - const DIAMOND_HOE = 293; - const GOLDEN_HOE = 294, GOLD_HOE = 294; - const SEEDS = 295, WHEAT_SEEDS = 295; - const WHEAT = 296; - const BREAD = 297; - const LEATHER_CAP = 298, LEATHER_HELMET = 298; - const LEATHER_CHESTPLATE = 299, LEATHER_TUNIC = 299; - const LEATHER_LEGGINGS = 300, LEATHER_PANTS = 300; - const LEATHER_BOOTS = 301; - const CHAINMAIL_HELMET = 302, CHAIN_HELMET = 302; - const CHAINMAIL_CHESTPLATE = 303, CHAIN_CHESTPLATE = 303; - const CHAINMAIL_LEGGINGS = 304, CHAIN_LEGGINGS = 304; - const CHAINMAIL_BOOTS = 305, CHAIN_BOOTS = 305; - const IRON_HELMET = 306; - const IRON_CHESTPLATE = 307; - const IRON_LEGGINGS = 308; - const IRON_BOOTS = 309; - const DIAMOND_HELMET = 310; - const DIAMOND_CHESTPLATE = 311; - const DIAMOND_LEGGINGS = 312; - const DIAMOND_BOOTS = 313; - const GOLDEN_HELMET = 314, GOLD_HELMET = 314; - const GOLDEN_CHESTPLATE = 315, GOLD_CHESTPLATE = 315; - const GOLDEN_LEGGINGS = 316, GOLD_LEGGINGS = 316; - const GOLDEN_BOOTS = 317, GOLD_BOOTS = 317; - const FLINT = 318; - const PORKCHOP = 319, RAW_PORKCHOP = 319; - const COOKED_PORKCHOP = 320; - const PAINTING = 321; - const GOLDEN_APPLE = 322; - const SIGN = 323; - const OAK_DOOR = 324, WOODEN_DOOR = 324; - const BUCKET = 325; + public const IRON_SHOVEL = 256; + public const IRON_PICKAXE = 257; + public const IRON_AXE = 258; + public const FLINT_AND_STEEL = 259, FLINT_STEEL = 259; + public const APPLE = 260; + public const BOW = 261; + public const ARROW = 262; + public const COAL = 263; + public const DIAMOND = 264; + public const IRON_INGOT = 265; + public const GOLD_INGOT = 266; + public const IRON_SWORD = 267; + public const WOODEN_SWORD = 268; + public const WOODEN_SHOVEL = 269; + public const WOODEN_PICKAXE = 270; + public const WOODEN_AXE = 271; + public const STONE_SWORD = 272; + public const STONE_SHOVEL = 273; + public const STONE_PICKAXE = 274; + public const STONE_AXE = 275; + public const DIAMOND_SWORD = 276; + public const DIAMOND_SHOVEL = 277; + public const DIAMOND_PICKAXE = 278; + public const DIAMOND_AXE = 279; + public const STICK = 280; + public const BOWL = 281; + public const MUSHROOM_STEW = 282; + public const GOLDEN_SWORD = 283, GOLD_SWORD = 283; + public const GOLDEN_SHOVEL = 284, GOLD_SHOVEL = 284; + public const GOLDEN_PICKAXE = 285, GOLD_PICKAXE = 285; + public const GOLDEN_AXE = 286, GOLD_AXE = 286; + public const STRING = 287; + public const FEATHER = 288; + public const GUNPOWDER = 289; + public const WOODEN_HOE = 290; + public const STONE_HOE = 291; + public const IRON_HOE = 292; + public const DIAMOND_HOE = 293; + public const GOLDEN_HOE = 294, GOLD_HOE = 294; + public const SEEDS = 295, WHEAT_SEEDS = 295; + public const WHEAT = 296; + public const BREAD = 297; + public const LEATHER_CAP = 298, LEATHER_HELMET = 298; + public const LEATHER_CHESTPLATE = 299, LEATHER_TUNIC = 299; + public const LEATHER_LEGGINGS = 300, LEATHER_PANTS = 300; + public const LEATHER_BOOTS = 301; + public const CHAINMAIL_HELMET = 302, CHAIN_HELMET = 302; + public const CHAINMAIL_CHESTPLATE = 303, CHAIN_CHESTPLATE = 303; + public const CHAINMAIL_LEGGINGS = 304, CHAIN_LEGGINGS = 304; + public const CHAINMAIL_BOOTS = 305, CHAIN_BOOTS = 305; + public const IRON_HELMET = 306; + public const IRON_CHESTPLATE = 307; + public const IRON_LEGGINGS = 308; + public const IRON_BOOTS = 309; + public const DIAMOND_HELMET = 310; + public const DIAMOND_CHESTPLATE = 311; + public const DIAMOND_LEGGINGS = 312; + public const DIAMOND_BOOTS = 313; + public const GOLDEN_HELMET = 314, GOLD_HELMET = 314; + public const GOLDEN_CHESTPLATE = 315, GOLD_CHESTPLATE = 315; + public const GOLDEN_LEGGINGS = 316, GOLD_LEGGINGS = 316; + public const GOLDEN_BOOTS = 317, GOLD_BOOTS = 317; + public const FLINT = 318; + public const PORKCHOP = 319, RAW_PORKCHOP = 319; + public const COOKED_PORKCHOP = 320; + public const PAINTING = 321; + public const GOLDEN_APPLE = 322; + public const SIGN = 323; + public const OAK_DOOR = 324, WOODEN_DOOR = 324; + public const BUCKET = 325; - const MINECART = 328; - const SADDLE = 329; - const IRON_DOOR = 330; - const REDSTONE = 331, REDSTONE_DUST = 331; - const SNOWBALL = 332; - const BOAT = 333; - const LEATHER = 334; + public const MINECART = 328; + public const SADDLE = 329; + public const IRON_DOOR = 330; + public const REDSTONE = 331, REDSTONE_DUST = 331; + public const SNOWBALL = 332; + public const BOAT = 333; + public const LEATHER = 334; - const BRICK = 336; - const CLAY = 337, CLAY_BALL = 337; - const REEDS = 338, SUGARCANE = 338; - const PAPER = 339; - const BOOK = 340; - const SLIMEBALL = 341, SLIME_BALL = 341; - const CHEST_MINECART = 342, MINECART_WITH_CHEST = 342; + public const BRICK = 336; + public const CLAY = 337, CLAY_BALL = 337; + public const REEDS = 338, SUGARCANE = 338; + public const PAPER = 339; + public const BOOK = 340; + public const SLIMEBALL = 341, SLIME_BALL = 341; + public const CHEST_MINECART = 342, MINECART_WITH_CHEST = 342; - const EGG = 344; - const COMPASS = 345; - const FISHING_ROD = 346; - const CLOCK = 347; - const GLOWSTONE_DUST = 348; - const FISH = 349, RAW_FISH = 349; - const COOKED_FISH = 350; - const DYE = 351; - const BONE = 352; - const SUGAR = 353; - const CAKE = 354; - const BED = 355; - const REPEATER = 356; - const COOKIE = 357; - const FILLED_MAP = 358; - const SHEARS = 359; - const MELON = 360, MELON_SLICE = 360; - const PUMPKIN_SEEDS = 361; - const MELON_SEEDS = 362; - const BEEF = 363, RAW_BEEF = 363; - const COOKED_BEEF = 364, STEAK = 364; - const CHICKEN = 365, RAW_CHICKEN = 365; - const COOKED_CHICKEN = 366; - const ROTTEN_FLESH = 367; - const ENDER_PEARL = 368; - const BLAZE_ROD = 369; - const GHAST_TEAR = 370; - const GOLDEN_NUGGET = 371, GOLD_NUGGET = 371; - const NETHER_WART = 372; - const POTION = 373; - const GLASS_BOTTLE = 374; - const SPIDER_EYE = 375; - const FERMENTED_SPIDER_EYE = 376; - const BLAZE_POWDER = 377; - const MAGMA_CREAM = 378; - const BREWING_STAND = 379; - const CAULDRON = 380; - const ENDER_EYE = 381; - const GLISTERING_MELON = 382, SPECKLED_MELON = 382; - const SPAWN_EGG = 383; - const BOTTLE_O_ENCHANTING = 384, EXPERIENCE_BOTTLE = 384; - const FIREBALL = 385, FIRE_CHARGE = 385; - const WRITABLE_BOOK = 386; - const WRITTEN_BOOK = 387; - const EMERALD = 388; - const FRAME = 389, ITEM_FRAME = 389; - const FLOWER_POT = 390; - const CARROT = 391; - const POTATO = 392; - const BAKED_POTATO = 393; - const POISONOUS_POTATO = 394; - const EMPTYMAP = 395, EMPTY_MAP = 395, MAP = 395; - const GOLDEN_CARROT = 396; - const MOB_HEAD = 397, SKULL = 397; - const CARROTONASTICK = 398, CARROT_ON_A_STICK = 398; - const NETHERSTAR = 399, NETHER_STAR = 399; - const PUMPKIN_PIE = 400; - const FIREWORKS = 401; - const FIREWORKSCHARGE = 402, FIREWORKS_CHARGE = 402; - const ENCHANTED_BOOK = 403; - const COMPARATOR = 404; - const NETHERBRICK = 405, NETHER_BRICK = 405; - const NETHER_QUARTZ = 406, QUARTZ = 406; - const MINECART_WITH_TNT = 407, TNT_MINECART = 407; - const HOPPER_MINECART = 408, MINECART_WITH_HOPPER = 408; - const PRISMARINE_SHARD = 409; - const HOPPER = 410; - const RABBIT = 411, RAW_RABBIT = 411; - const COOKED_RABBIT = 412; - const RABBIT_STEW = 413; - const RABBIT_FOOT = 414; - const RABBIT_HIDE = 415; - const HORSEARMORLEATHER = 416, HORSE_ARMOR_LEATHER = 416, LEATHER_HORSE_ARMOR = 416; - const HORSEARMORIRON = 417, HORSE_ARMOR_IRON = 417, IRON_HORSE_ARMOR = 417; - const GOLD_HORSE_ARMOR = 418, HORSEARMORGOLD = 418, HORSE_ARMOR_GOLD = 418; - const DIAMOND_HORSE_ARMOR = 419, HORSEARMORDIAMOND = 419, HORSE_ARMOR_DIAMOND = 419; - const LEAD = 420; - const NAMETAG = 421, NAME_TAG = 421; - const PRISMARINE_CRYSTALS = 422; - const MUTTONRAW = 423, MUTTON_RAW = 423, RAW_MUTTON = 423; - const COOKED_MUTTON = 424, MUTTONCOOKED = 424, MUTTON_COOKED = 424; - const ARMOR_STAND = 425; - const END_CRYSTAL = 426; - const SPRUCE_DOOR = 427; - const BIRCH_DOOR = 428; - const JUNGLE_DOOR = 429; - const ACACIA_DOOR = 430; - const DARK_OAK_DOOR = 431; - const CHORUS_FRUIT = 432; - const CHORUS_FRUIT_POPPED = 433; + public const EGG = 344; + public const COMPASS = 345; + public const FISHING_ROD = 346; + public const CLOCK = 347; + public const GLOWSTONE_DUST = 348; + public const FISH = 349, RAW_FISH = 349; + public const COOKED_FISH = 350; + public const DYE = 351; + public const BONE = 352; + public const SUGAR = 353; + public const CAKE = 354; + public const BED = 355; + public const REPEATER = 356; + public const COOKIE = 357; + public const FILLED_MAP = 358; + public const SHEARS = 359; + public const MELON = 360, MELON_SLICE = 360; + public const PUMPKIN_SEEDS = 361; + public const MELON_SEEDS = 362; + public const BEEF = 363, RAW_BEEF = 363; + public const COOKED_BEEF = 364, STEAK = 364; + public const CHICKEN = 365, RAW_CHICKEN = 365; + public const COOKED_CHICKEN = 366; + public const ROTTEN_FLESH = 367; + public const ENDER_PEARL = 368; + public const BLAZE_ROD = 369; + public const GHAST_TEAR = 370; + public const GOLDEN_NUGGET = 371, GOLD_NUGGET = 371; + public const NETHER_WART = 372; + public const POTION = 373; + public const GLASS_BOTTLE = 374; + public const SPIDER_EYE = 375; + public const FERMENTED_SPIDER_EYE = 376; + public const BLAZE_POWDER = 377; + public const MAGMA_CREAM = 378; + public const BREWING_STAND = 379; + public const CAULDRON = 380; + public const ENDER_EYE = 381; + public const GLISTERING_MELON = 382, SPECKLED_MELON = 382; + public const SPAWN_EGG = 383; + public const BOTTLE_O_ENCHANTING = 384, EXPERIENCE_BOTTLE = 384; + public const FIREBALL = 385, FIRE_CHARGE = 385; + public const WRITABLE_BOOK = 386; + public const WRITTEN_BOOK = 387; + public const EMERALD = 388; + public const FRAME = 389, ITEM_FRAME = 389; + public const FLOWER_POT = 390; + public const CARROT = 391; + public const POTATO = 392; + public const BAKED_POTATO = 393; + public const POISONOUS_POTATO = 394; + public const EMPTYMAP = 395, EMPTY_MAP = 395, MAP = 395; + public const GOLDEN_CARROT = 396; + public const MOB_HEAD = 397, SKULL = 397; + public const CARROTONASTICK = 398, CARROT_ON_A_STICK = 398; + public const NETHERSTAR = 399, NETHER_STAR = 399; + public const PUMPKIN_PIE = 400; + public const FIREWORKS = 401; + public const FIREWORKSCHARGE = 402, FIREWORKS_CHARGE = 402; + public const ENCHANTED_BOOK = 403; + public const COMPARATOR = 404; + public const NETHERBRICK = 405, NETHER_BRICK = 405; + public const NETHER_QUARTZ = 406, QUARTZ = 406; + public const MINECART_WITH_TNT = 407, TNT_MINECART = 407; + public const HOPPER_MINECART = 408, MINECART_WITH_HOPPER = 408; + public const PRISMARINE_SHARD = 409; + public const HOPPER = 410; + public const RABBIT = 411, RAW_RABBIT = 411; + public const COOKED_RABBIT = 412; + public const RABBIT_STEW = 413; + public const RABBIT_FOOT = 414; + public const RABBIT_HIDE = 415; + public const HORSEARMORLEATHER = 416, HORSE_ARMOR_LEATHER = 416, LEATHER_HORSE_ARMOR = 416; + public const HORSEARMORIRON = 417, HORSE_ARMOR_IRON = 417, IRON_HORSE_ARMOR = 417; + public const GOLD_HORSE_ARMOR = 418, HORSEARMORGOLD = 418, HORSE_ARMOR_GOLD = 418; + public const DIAMOND_HORSE_ARMOR = 419, HORSEARMORDIAMOND = 419, HORSE_ARMOR_DIAMOND = 419; + public const LEAD = 420; + public const NAMETAG = 421, NAME_TAG = 421; + public const PRISMARINE_CRYSTALS = 422; + public const MUTTONRAW = 423, MUTTON_RAW = 423, RAW_MUTTON = 423; + public const COOKED_MUTTON = 424, MUTTONCOOKED = 424, MUTTON_COOKED = 424; + public const ARMOR_STAND = 425; + public const END_CRYSTAL = 426; + public const SPRUCE_DOOR = 427; + public const BIRCH_DOOR = 428; + public const JUNGLE_DOOR = 429; + public const ACACIA_DOOR = 430; + public const DARK_OAK_DOOR = 431; + public const CHORUS_FRUIT = 432; + public const CHORUS_FRUIT_POPPED = 433; - const DRAGON_BREATH = 437; - const SPLASH_POTION = 438; + public const DRAGON_BREATH = 437; + public const SPLASH_POTION = 438; - const LINGERING_POTION = 441; + public const LINGERING_POTION = 441; - const COMMAND_BLOCK_MINECART = 443, MINECART_WITH_COMMAND_BLOCK = 443; - const ELYTRA = 444; - const SHULKER_SHELL = 445; - const BANNER = 446; + public const COMMAND_BLOCK_MINECART = 443, MINECART_WITH_COMMAND_BLOCK = 443; + public const ELYTRA = 444; + public const SHULKER_SHELL = 445; + public const BANNER = 446; - const TOTEM = 450; + public const TOTEM = 450; - const IRON_NUGGET = 452; + public const IRON_NUGGET = 452; - const BEETROOT = 457; - const BEETROOT_SEEDS = 458; - const BEETROOT_SOUP = 459; - const RAW_SALMON = 460, SALMON = 460; - const CLOWNFISH = 461; - const PUFFERFISH = 462; - const COOKED_SALMON = 463; + public const BEETROOT = 457; + public const BEETROOT_SEEDS = 458; + public const BEETROOT_SOUP = 459; + public const RAW_SALMON = 460, SALMON = 460; + public const CLOWNFISH = 461; + public const PUFFERFISH = 462; + public const COOKED_SALMON = 463; - const APPLEENCHANTED = 466, APPLE_ENCHANTED = 466, ENCHANTED_GOLDEN_APPLE = 466; + public const APPLEENCHANTED = 466, APPLE_ENCHANTED = 466, ENCHANTED_GOLDEN_APPLE = 466; - const RECORD_13 = 500; - const RECORD_CAT = 501; - const RECORD_BLOCKS = 502; - const RECORD_CHIRP = 503; - const RECORD_FAR = 504; - const RECORD_MALL = 505; - const RECORD_MELLOHI = 506; - const RECORD_STAL = 507; - const RECORD_STRAD = 508; - const RECORD_WARD = 509; - const RECORD_11 = 510; - const RECORD_WAIT = 511; + public const RECORD_13 = 500; + public const RECORD_CAT = 501; + public const RECORD_BLOCKS = 502; + public const RECORD_CHIRP = 503; + public const RECORD_FAR = 504; + public const RECORD_MALL = 505; + public const RECORD_MELLOHI = 506; + public const RECORD_STAL = 507; + public const RECORD_STRAD = 508; + public const RECORD_WARD = 509; + public const RECORD_11 = 510; + public const RECORD_WAIT = 511; } diff --git a/src/pocketmine/item/Tool.php b/src/pocketmine/item/Tool.php index 329824b7e..42b83b88d 100644 --- a/src/pocketmine/item/Tool.php +++ b/src/pocketmine/item/Tool.php @@ -27,18 +27,18 @@ use pocketmine\block\Block; use pocketmine\entity\Entity; abstract class Tool extends Durable{ - const TIER_WOODEN = 1; - const TIER_GOLD = 2; - const TIER_STONE = 3; - const TIER_IRON = 4; - const TIER_DIAMOND = 5; + public const TIER_WOODEN = 1; + public const TIER_GOLD = 2; + public const TIER_STONE = 3; + public const TIER_IRON = 4; + public const TIER_DIAMOND = 5; - const TYPE_NONE = 0; - const TYPE_SWORD = 1; - const TYPE_SHOVEL = 2; - const TYPE_PICKAXE = 3; - const TYPE_AXE = 4; - const TYPE_SHEARS = 5; + public const TYPE_NONE = 0; + public const TYPE_SWORD = 1; + public const TYPE_SHOVEL = 2; + public const TYPE_PICKAXE = 3; + public const TYPE_AXE = 4; + public const TYPE_SHEARS = 5; public function getMaxStackSize() : int{ return 1; diff --git a/src/pocketmine/item/WritableBook.php b/src/pocketmine/item/WritableBook.php index a7250e662..166d71f79 100644 --- a/src/pocketmine/item/WritableBook.php +++ b/src/pocketmine/item/WritableBook.php @@ -30,9 +30,9 @@ use pocketmine\nbt\tag\StringTag; class WritableBook extends Item{ - const TAG_PAGES = "pages"; //TAG_List - const TAG_PAGE_TEXT = "text"; //TAG_String - const TAG_PAGE_PHOTONAME = "photoname"; //TAG_String - TODO + public const TAG_PAGES = "pages"; //TAG_List + public const TAG_PAGE_TEXT = "text"; //TAG_String + public const TAG_PAGE_PHOTONAME = "photoname"; //TAG_String - TODO public function __construct(int $meta = 0){ parent::__construct(self::WRITABLE_BOOK, $meta, "Book & Quill"); diff --git a/src/pocketmine/item/WrittenBook.php b/src/pocketmine/item/WrittenBook.php index 22ff953c1..c67769060 100644 --- a/src/pocketmine/item/WrittenBook.php +++ b/src/pocketmine/item/WrittenBook.php @@ -25,14 +25,14 @@ namespace pocketmine\item; class WrittenBook extends WritableBook{ - const GENERATION_ORIGINAL = 0; - const GENERATION_COPY = 1; - const GENERATION_COPY_OF_COPY = 2; - const GENERATION_TATTERED = 3; + public const GENERATION_ORIGINAL = 0; + public const GENERATION_COPY = 1; + public const GENERATION_COPY_OF_COPY = 2; + public const GENERATION_TATTERED = 3; - const TAG_GENERATION = "generation"; //TAG_Int - const TAG_AUTHOR = "author"; //TAG_String - const TAG_TITLE = "title"; //TAG_String + public const TAG_GENERATION = "generation"; //TAG_Int + public const TAG_AUTHOR = "author"; //TAG_String + public const TAG_TITLE = "title"; //TAG_String public function __construct(int $meta = 0){ Item::__construct(self::WRITTEN_BOOK, $meta, "Written Book"); diff --git a/src/pocketmine/item/enchantment/Enchantment.php b/src/pocketmine/item/enchantment/Enchantment.php index cb624b24f..7017a6f07 100644 --- a/src/pocketmine/item/enchantment/Enchantment.php +++ b/src/pocketmine/item/enchantment/Enchantment.php @@ -26,62 +26,62 @@ namespace pocketmine\item\enchantment; class Enchantment{ - const PROTECTION = 0; - const FIRE_PROTECTION = 1; - const FEATHER_FALLING = 2; - const BLAST_PROTECTION = 3; - const PROJECTILE_PROTECTION = 4; - const THORNS = 5; - const RESPIRATION = 6; - const DEPTH_STRIDER = 7; - const AQUA_AFFINITY = 8; - const SHARPNESS = 9; - const SMITE = 10; - const BANE_OF_ARTHROPODS = 11; - const KNOCKBACK = 12; - const FIRE_ASPECT = 13; - const LOOTING = 14; - const EFFICIENCY = 15; - const SILK_TOUCH = 16; - const UNBREAKING = 17; - const FORTUNE = 18; - const POWER = 19; - const PUNCH = 20; - const FLAME = 21; - const INFINITY = 22; - const LUCK_OF_THE_SEA = 23; - const LURE = 24; - const FROST_WALKER = 25; - const MENDING = 26; + public const PROTECTION = 0; + public const FIRE_PROTECTION = 1; + public const FEATHER_FALLING = 2; + public const BLAST_PROTECTION = 3; + public const PROJECTILE_PROTECTION = 4; + public const THORNS = 5; + public const RESPIRATION = 6; + public const DEPTH_STRIDER = 7; + public const AQUA_AFFINITY = 8; + public const SHARPNESS = 9; + public const SMITE = 10; + public const BANE_OF_ARTHROPODS = 11; + public const KNOCKBACK = 12; + public const FIRE_ASPECT = 13; + public const LOOTING = 14; + public const EFFICIENCY = 15; + public const SILK_TOUCH = 16; + public const UNBREAKING = 17; + public const FORTUNE = 18; + public const POWER = 19; + public const PUNCH = 20; + public const FLAME = 21; + public const INFINITY = 22; + public const LUCK_OF_THE_SEA = 23; + public const LURE = 24; + public const FROST_WALKER = 25; + public const MENDING = 26; - const RARITY_COMMON = 0; - const RARITY_UNCOMMON = 1; - const RARITY_RARE = 2; - const RARITY_MYTHIC = 3; + public const RARITY_COMMON = 0; + public const RARITY_UNCOMMON = 1; + public const RARITY_RARE = 2; + public const RARITY_MYTHIC = 3; - const ACTIVATION_EQUIP = 0; - const ACTIVATION_HELD = 1; - const ACTIVATION_SELF = 2; + public const ACTIVATION_EQUIP = 0; + public const ACTIVATION_HELD = 1; + public const ACTIVATION_SELF = 2; - const SLOT_NONE = 0; - const SLOT_ALL = 0b11111111111111; - const SLOT_ARMOR = 0b1111; - const SLOT_HEAD = 0b1; - const SLOT_TORSO = 0b10; - const SLOT_LEGS = 0b100; - const SLOT_FEET = 0b1000; - const SLOT_SWORD = 0b10000; - const SLOT_BOW = 0b100000; - const SLOT_TOOL = 0b111000000; - const SLOT_HOE = 0b1000000; - const SLOT_SHEARS = 0b10000000; - const SLOT_FLINT_AND_STEEL = 0b10000000; - const SLOT_DIG = 0b111000000000; - const SLOT_AXE = 0b1000000000; - const SLOT_PICKAXE = 0b10000000000; - const SLOT_SHOVEL = 0b10000000000; - const SLOT_FISHING_ROD = 0b100000000000; - const SLOT_CARROT_STICK = 0b1000000000000; + public const SLOT_NONE = 0; + public const SLOT_ALL = 0b11111111111111; + public const SLOT_ARMOR = 0b1111; + public const SLOT_HEAD = 0b1; + public const SLOT_TORSO = 0b10; + public const SLOT_LEGS = 0b100; + public const SLOT_FEET = 0b1000; + public const SLOT_SWORD = 0b10000; + public const SLOT_BOW = 0b100000; + public const SLOT_TOOL = 0b111000000; + public const SLOT_HOE = 0b1000000; + public const SLOT_SHEARS = 0b10000000; + public const SLOT_FLINT_AND_STEEL = 0b10000000; + public const SLOT_DIG = 0b111000000000; + public const SLOT_AXE = 0b1000000000; + public const SLOT_PICKAXE = 0b10000000000; + public const SLOT_SHOVEL = 0b10000000000; + public const SLOT_FISHING_ROD = 0b100000000000; + public const SLOT_CARROT_STICK = 0b1000000000000; /** @var Enchantment[] */ protected static $enchantments; diff --git a/src/pocketmine/lang/BaseLang.php b/src/pocketmine/lang/BaseLang.php index cce83c271..4d2d3a78f 100644 --- a/src/pocketmine/lang/BaseLang.php +++ b/src/pocketmine/lang/BaseLang.php @@ -29,7 +29,7 @@ use pocketmine\utils\MainLogger; class BaseLang{ - const FALLBACK_LANGUAGE = "eng"; + public const FALLBACK_LANGUAGE = "eng"; public static function getLanguageList(string $path = "") : array{ if($path === ""){ diff --git a/src/pocketmine/level/Level.php b/src/pocketmine/level/Level.php index b6b377a30..b50b52f62 100644 --- a/src/pocketmine/level/Level.php +++ b/src/pocketmine/level/Level.php @@ -93,26 +93,26 @@ class Level implements ChunkManager, Metadatable{ private static $levelIdCounter = 1; private static $chunkLoaderCounter = 1; - const Y_MASK = 0xFF; - const Y_MAX = 0x100; //256 + public const Y_MASK = 0xFF; + public const Y_MAX = 0x100; //256 - const BLOCK_UPDATE_NORMAL = 1; - const BLOCK_UPDATE_RANDOM = 2; - const BLOCK_UPDATE_SCHEDULED = 3; - const BLOCK_UPDATE_WEAK = 4; - const BLOCK_UPDATE_TOUCH = 5; + public const BLOCK_UPDATE_NORMAL = 1; + public const BLOCK_UPDATE_RANDOM = 2; + public const BLOCK_UPDATE_SCHEDULED = 3; + public const BLOCK_UPDATE_WEAK = 4; + public const BLOCK_UPDATE_TOUCH = 5; - const TIME_DAY = 0; - const TIME_SUNSET = 12000; - const TIME_NIGHT = 14000; - const TIME_SUNRISE = 23000; + public const TIME_DAY = 0; + public const TIME_SUNSET = 12000; + public const TIME_NIGHT = 14000; + public const TIME_SUNRISE = 23000; - const TIME_FULL = 24000; + public const TIME_FULL = 24000; - const DIFFICULTY_PEACEFUL = 0; - const DIFFICULTY_EASY = 1; - const DIFFICULTY_NORMAL = 2; - const DIFFICULTY_HARD = 3; + public const DIFFICULTY_PEACEFUL = 0; + public const DIFFICULTY_EASY = 1; + public const DIFFICULTY_NORMAL = 2; + public const DIFFICULTY_HARD = 3; /** @var Tile[] */ private $tiles = []; diff --git a/src/pocketmine/level/MovingObjectPosition.php b/src/pocketmine/level/MovingObjectPosition.php index 4ec5a53a7..36e1a4068 100644 --- a/src/pocketmine/level/MovingObjectPosition.php +++ b/src/pocketmine/level/MovingObjectPosition.php @@ -27,8 +27,8 @@ use pocketmine\entity\Entity; use pocketmine\math\Vector3; class MovingObjectPosition{ - const TYPE_BLOCK_COLLISION = 0; - const TYPE_ENTITY_COLLISION = 1; + public const TYPE_BLOCK_COLLISION = 0; + public const TYPE_ENTITY_COLLISION = 1; /** @var int */ public $typeOfHit; diff --git a/src/pocketmine/level/format/Chunk.php b/src/pocketmine/level/format/Chunk.php index d3c8a002e..c96168e0e 100644 --- a/src/pocketmine/level/format/Chunk.php +++ b/src/pocketmine/level/format/Chunk.php @@ -38,7 +38,7 @@ use pocketmine\utils\BinaryStream; class Chunk{ - const MAX_SUBCHUNKS = 16; + public const MAX_SUBCHUNKS = 16; protected $x; protected $z; diff --git a/src/pocketmine/level/format/io/leveldb/LevelDB.php b/src/pocketmine/level/format/io/leveldb/LevelDB.php index c106bcd54..e05e4d14a 100644 --- a/src/pocketmine/level/format/io/leveldb/LevelDB.php +++ b/src/pocketmine/level/format/io/leveldb/LevelDB.php @@ -44,35 +44,35 @@ use pocketmine\utils\MainLogger; class LevelDB extends BaseLevelProvider{ //According to Tomasso, these aren't supposed to be readable anymore. Thankfully he didn't change the readable ones... - const TAG_DATA_2D = "\x2d"; - const TAG_DATA_2D_LEGACY = "\x2e"; - const TAG_SUBCHUNK_PREFIX = "\x2f"; - const TAG_LEGACY_TERRAIN = "0"; - const TAG_BLOCK_ENTITY = "1"; - const TAG_ENTITY = "2"; - const TAG_PENDING_TICK = "3"; - const TAG_BLOCK_EXTRA_DATA = "4"; - const TAG_BIOME_STATE = "5"; - const TAG_STATE_FINALISATION = "6"; + public const TAG_DATA_2D = "\x2d"; + public const TAG_DATA_2D_LEGACY = "\x2e"; + public const TAG_SUBCHUNK_PREFIX = "\x2f"; + public const TAG_LEGACY_TERRAIN = "0"; + public const TAG_BLOCK_ENTITY = "1"; + public const TAG_ENTITY = "2"; + public const TAG_PENDING_TICK = "3"; + public const TAG_BLOCK_EXTRA_DATA = "4"; + public const TAG_BIOME_STATE = "5"; + public const TAG_STATE_FINALISATION = "6"; - const TAG_BORDER_BLOCKS = "8"; - const TAG_HARDCODED_SPAWNERS = "9"; + public const TAG_BORDER_BLOCKS = "8"; + public const TAG_HARDCODED_SPAWNERS = "9"; - const FINALISATION_NEEDS_INSTATICKING = 0; - const FINALISATION_NEEDS_POPULATION = 1; - const FINALISATION_DONE = 2; + public const FINALISATION_NEEDS_INSTATICKING = 0; + public const FINALISATION_NEEDS_POPULATION = 1; + public const FINALISATION_DONE = 2; - const TAG_VERSION = "v"; + public const TAG_VERSION = "v"; - const ENTRY_FLAT_WORLD_LAYERS = "game_flatworldlayers"; + public const ENTRY_FLAT_WORLD_LAYERS = "game_flatworldlayers"; - const GENERATOR_LIMITED = 0; - const GENERATOR_INFINITE = 1; - const GENERATOR_FLAT = 2; + public const GENERATOR_LIMITED = 0; + public const GENERATOR_INFINITE = 1; + public const GENERATOR_FLAT = 2; - const CURRENT_STORAGE_VERSION = 6; //Current MCPE level format version - const CURRENT_LEVEL_CHUNK_VERSION = 7; - const CURRENT_LEVEL_SUBCHUNK_VERSION = 0; + public const CURRENT_STORAGE_VERSION = 6; //Current MCPE level format version + public const CURRENT_LEVEL_CHUNK_VERSION = 7; + public const CURRENT_LEVEL_SUBCHUNK_VERSION = 0; /** @var Chunk[] */ protected $chunks = []; diff --git a/src/pocketmine/level/format/io/region/Anvil.php b/src/pocketmine/level/format/io/region/Anvil.php index 0a7892039..4e87f0490 100644 --- a/src/pocketmine/level/format/io/region/Anvil.php +++ b/src/pocketmine/level/format/io/region/Anvil.php @@ -36,7 +36,7 @@ use pocketmine\utils\MainLogger; class Anvil extends McRegion{ - const REGION_FILE_EXTENSION = "mca"; + public const REGION_FILE_EXTENSION = "mca"; public function nbtSerialize(Chunk $chunk) : string{ $nbt = new CompoundTag("Level", []); diff --git a/src/pocketmine/level/format/io/region/McRegion.php b/src/pocketmine/level/format/io/region/McRegion.php index 3d4f60cc0..addfc9b33 100644 --- a/src/pocketmine/level/format/io/region/McRegion.php +++ b/src/pocketmine/level/format/io/region/McRegion.php @@ -38,7 +38,7 @@ use pocketmine\utils\MainLogger; class McRegion extends BaseLevelProvider{ - const REGION_FILE_EXTENSION = "mcr"; + public const REGION_FILE_EXTENSION = "mcr"; /** @var RegionLoader[] */ protected $regions = []; diff --git a/src/pocketmine/level/format/io/region/PMAnvil.php b/src/pocketmine/level/format/io/region/PMAnvil.php index 9b6a88749..39a0001af 100644 --- a/src/pocketmine/level/format/io/region/PMAnvil.php +++ b/src/pocketmine/level/format/io/region/PMAnvil.php @@ -33,7 +33,7 @@ use pocketmine\nbt\tag\CompoundTag; */ class PMAnvil extends Anvil{ - const REGION_FILE_EXTENSION = "mcapm"; + public const REGION_FILE_EXTENSION = "mcapm"; protected function serializeSubChunk(SubChunk $subChunk) : CompoundTag{ return new CompoundTag("", [ diff --git a/src/pocketmine/level/format/io/region/RegionLoader.php b/src/pocketmine/level/format/io/region/RegionLoader.php index 003379e5a..87a1bc3b7 100644 --- a/src/pocketmine/level/format/io/region/RegionLoader.php +++ b/src/pocketmine/level/format/io/region/RegionLoader.php @@ -29,13 +29,13 @@ use pocketmine\utils\Binary; use pocketmine\utils\MainLogger; class RegionLoader{ - const VERSION = 1; - const COMPRESSION_GZIP = 1; - const COMPRESSION_ZLIB = 2; + public const VERSION = 1; + public const COMPRESSION_GZIP = 1; + public const COMPRESSION_ZLIB = 2; - const MAX_SECTOR_LENGTH = 256 << 12; //256 sectors, (1 MiB) - const REGION_HEADER_LENGTH = 8192; //4096 location table + 4096 timestamps - const MAX_REGION_FILE_SIZE = 32 * 32 * self::MAX_SECTOR_LENGTH + self::REGION_HEADER_LENGTH; //32 * 32 1MiB chunks + header size + public const MAX_SECTOR_LENGTH = 256 << 12; //256 sectors, (1 MiB) + public const REGION_HEADER_LENGTH = 8192; //4096 location table + 4096 timestamps + public const MAX_REGION_FILE_SIZE = 32 * 32 * self::MAX_SECTOR_LENGTH + self::REGION_HEADER_LENGTH; //32 * 32 1MiB chunks + header size public static $COMPRESSION_LEVEL = 7; diff --git a/src/pocketmine/level/generator/biome/Biome.php b/src/pocketmine/level/generator/biome/Biome.php index 901aada0a..3af11f8b4 100644 --- a/src/pocketmine/level/generator/biome/Biome.php +++ b/src/pocketmine/level/generator/biome/Biome.php @@ -40,27 +40,27 @@ use pocketmine\utils\Random; abstract class Biome{ - const OCEAN = 0; - const PLAINS = 1; - const DESERT = 2; - const MOUNTAINS = 3; - const FOREST = 4; - const TAIGA = 5; - const SWAMP = 6; - const RIVER = 7; + public const OCEAN = 0; + public const PLAINS = 1; + public const DESERT = 2; + public const MOUNTAINS = 3; + public const FOREST = 4; + public const TAIGA = 5; + public const SWAMP = 6; + public const RIVER = 7; - const HELL = 8; + public const HELL = 8; - const ICE_PLAINS = 12; + public const ICE_PLAINS = 12; - const SMALL_MOUNTAINS = 20; + public const SMALL_MOUNTAINS = 20; - const BIRCH_FOREST = 27; + public const BIRCH_FOREST = 27; - const MAX_BIOMES = 256; + public const MAX_BIOMES = 256; /** @var Biome[] */ private static $biomes = []; diff --git a/src/pocketmine/level/generator/normal/biome/ForestBiome.php b/src/pocketmine/level/generator/normal/biome/ForestBiome.php index b476e3962..5d7f55a13 100644 --- a/src/pocketmine/level/generator/normal/biome/ForestBiome.php +++ b/src/pocketmine/level/generator/normal/biome/ForestBiome.php @@ -29,8 +29,8 @@ use pocketmine\level\generator\populator\Tree; class ForestBiome extends GrassyBiome{ - const TYPE_NORMAL = 0; - const TYPE_BIRCH = 1; + public const TYPE_NORMAL = 0; + public const TYPE_BIRCH = 1; public $type; diff --git a/src/pocketmine/level/particle/Particle.php b/src/pocketmine/level/particle/Particle.php index 8d05baa49..4962d0fb4 100644 --- a/src/pocketmine/level/particle/Particle.php +++ b/src/pocketmine/level/particle/Particle.php @@ -28,47 +28,47 @@ use pocketmine\network\mcpe\protocol\DataPacket; abstract class Particle extends Vector3{ - const TYPE_BUBBLE = 1; - const TYPE_CRITICAL = 2; - const TYPE_BLOCK_FORCE_FIELD = 3; - const TYPE_SMOKE = 4; - const TYPE_EXPLODE = 5; - const TYPE_EVAPORATION = 6; - const TYPE_FLAME = 7; - const TYPE_LAVA = 8; - const TYPE_LARGE_SMOKE = 9; - const TYPE_REDSTONE = 10; - const TYPE_RISING_RED_DUST = 11; - const TYPE_ITEM_BREAK = 12; - const TYPE_SNOWBALL_POOF = 13; - const TYPE_HUGE_EXPLODE = 14; - const TYPE_HUGE_EXPLODE_SEED = 15; - const TYPE_MOB_FLAME = 16; - const TYPE_HEART = 17; - const TYPE_TERRAIN = 18; - const TYPE_SUSPENDED_TOWN = 19, TYPE_TOWN_AURA = 19; - const TYPE_PORTAL = 20; - const TYPE_SPLASH = 21, TYPE_WATER_SPLASH = 21; - const TYPE_WATER_WAKE = 22; - const TYPE_DRIP_WATER = 23; - const TYPE_DRIP_LAVA = 24; - const TYPE_FALLING_DUST = 25, TYPE_DUST = 25; - const TYPE_MOB_SPELL = 26; - const TYPE_MOB_SPELL_AMBIENT = 27; - const TYPE_MOB_SPELL_INSTANTANEOUS = 28; - const TYPE_INK = 29; - const TYPE_SLIME = 30; - const TYPE_RAIN_SPLASH = 31; - const TYPE_VILLAGER_ANGRY = 32; - const TYPE_VILLAGER_HAPPY = 33; - const TYPE_ENCHANTMENT_TABLE = 34; - const TYPE_TRACKING_EMITTER = 35; - const TYPE_NOTE = 36; - const TYPE_WITCH_SPELL = 37; - const TYPE_CARROT = 38; + public const TYPE_BUBBLE = 1; + public const TYPE_CRITICAL = 2; + public const TYPE_BLOCK_FORCE_FIELD = 3; + public const TYPE_SMOKE = 4; + public const TYPE_EXPLODE = 5; + public const TYPE_EVAPORATION = 6; + public const TYPE_FLAME = 7; + public const TYPE_LAVA = 8; + public const TYPE_LARGE_SMOKE = 9; + public const TYPE_REDSTONE = 10; + public const TYPE_RISING_RED_DUST = 11; + public const TYPE_ITEM_BREAK = 12; + public const TYPE_SNOWBALL_POOF = 13; + public const TYPE_HUGE_EXPLODE = 14; + public const TYPE_HUGE_EXPLODE_SEED = 15; + public const TYPE_MOB_FLAME = 16; + public const TYPE_HEART = 17; + public const TYPE_TERRAIN = 18; + public const TYPE_SUSPENDED_TOWN = 19, TYPE_TOWN_AURA = 19; + public const TYPE_PORTAL = 20; + public const TYPE_SPLASH = 21, TYPE_WATER_SPLASH = 21; + public const TYPE_WATER_WAKE = 22; + public const TYPE_DRIP_WATER = 23; + public const TYPE_DRIP_LAVA = 24; + public const TYPE_FALLING_DUST = 25, TYPE_DUST = 25; + public const TYPE_MOB_SPELL = 26; + public const TYPE_MOB_SPELL_AMBIENT = 27; + public const TYPE_MOB_SPELL_INSTANTANEOUS = 28; + public const TYPE_INK = 29; + public const TYPE_SLIME = 30; + public const TYPE_RAIN_SPLASH = 31; + public const TYPE_VILLAGER_ANGRY = 32; + public const TYPE_VILLAGER_HAPPY = 33; + public const TYPE_ENCHANTMENT_TABLE = 34; + public const TYPE_TRACKING_EMITTER = 35; + public const TYPE_NOTE = 36; + public const TYPE_WITCH_SPELL = 37; + public const TYPE_CARROT = 38; //39 unknown - const TYPE_END_ROD = 40; - const TYPE_DRAGONS_BREATH = 41; + public const TYPE_END_ROD = 40; + public const TYPE_DRAGONS_BREATH = 41; /** * @return DataPacket|DataPacket[] diff --git a/src/pocketmine/math/Vector3.php b/src/pocketmine/math/Vector3.php index 86dc6bb3d..f45b1fd1c 100644 --- a/src/pocketmine/math/Vector3.php +++ b/src/pocketmine/math/Vector3.php @@ -25,12 +25,12 @@ namespace pocketmine\math; class Vector3{ - const SIDE_DOWN = 0; - const SIDE_UP = 1; - const SIDE_NORTH = 2; - const SIDE_SOUTH = 3; - const SIDE_WEST = 4; - const SIDE_EAST = 5; + public const SIDE_DOWN = 0; + public const SIDE_UP = 1; + public const SIDE_NORTH = 2; + public const SIDE_SOUTH = 3; + public const SIDE_WEST = 4; + public const SIDE_EAST = 5; public $x; public $y; diff --git a/src/pocketmine/nbt/NBT.php b/src/pocketmine/nbt/NBT.php index 80d60b3f7..debc56946 100644 --- a/src/pocketmine/nbt/NBT.php +++ b/src/pocketmine/nbt/NBT.php @@ -53,20 +53,20 @@ use pocketmine\utils\Binary; */ class NBT{ - const LITTLE_ENDIAN = 0; - const BIG_ENDIAN = 1; - const TAG_End = 0; - const TAG_Byte = 1; - const TAG_Short = 2; - const TAG_Int = 3; - const TAG_Long = 4; - const TAG_Float = 5; - const TAG_Double = 6; - const TAG_ByteArray = 7; - const TAG_String = 8; - const TAG_List = 9; - const TAG_Compound = 10; - const TAG_IntArray = 11; + public const LITTLE_ENDIAN = 0; + public const BIG_ENDIAN = 1; + public const TAG_End = 0; + public const TAG_Byte = 1; + public const TAG_Short = 2; + public const TAG_Int = 3; + public const TAG_Long = 4; + public const TAG_Float = 5; + public const TAG_Double = 6; + public const TAG_ByteArray = 7; + public const TAG_String = 8; + public const TAG_List = 9; + public const TAG_Compound = 10; + public const TAG_IntArray = 11; public $buffer; public $offset; diff --git a/src/pocketmine/network/mcpe/VerifyLoginTask.php b/src/pocketmine/network/mcpe/VerifyLoginTask.php index e71bec8c5..c0967afd7 100644 --- a/src/pocketmine/network/mcpe/VerifyLoginTask.php +++ b/src/pocketmine/network/mcpe/VerifyLoginTask.php @@ -30,7 +30,7 @@ use pocketmine\Server; class VerifyLoginTask extends AsyncTask{ - const MOJANG_ROOT_PUBLIC_KEY = "MHYwEAYHKoZIzj0CAQYFK4EEACIDYgAE8ELkixyLcwlZryUQcu1TvPOmI2B7vX83ndnWRUaXm74wFfa5f/lwQNTfrLVHa2PmenpGI6JhIMUJaWZrjmMj90NoKNFSNBuKdm8rYiXsfaz3K36x/1U26HpG0ZxK/V1V"; + public const MOJANG_ROOT_PUBLIC_KEY = "MHYwEAYHKoZIzj0CAQYFK4EEACIDYgAE8ELkixyLcwlZryUQcu1TvPOmI2B7vX83ndnWRUaXm74wFfa5f/lwQNTfrLVHa2PmenpGI6JhIMUJaWZrjmMj90NoKNFSNBuKdm8rYiXsfaz3K36x/1U26HpG0ZxK/V1V"; /** @var LoginPacket */ private $packet; diff --git a/src/pocketmine/network/mcpe/protocol/AddBehaviorTreePacket.php b/src/pocketmine/network/mcpe/protocol/AddBehaviorTreePacket.php index 5a5151169..03c2057ec 100644 --- a/src/pocketmine/network/mcpe/protocol/AddBehaviorTreePacket.php +++ b/src/pocketmine/network/mcpe/protocol/AddBehaviorTreePacket.php @@ -28,7 +28,7 @@ namespace pocketmine\network\mcpe\protocol; use pocketmine\network\mcpe\NetworkSession; class AddBehaviorTreePacket extends DataPacket{ - const NETWORK_ID = ProtocolInfo::ADD_BEHAVIOR_TREE_PACKET; + public const NETWORK_ID = ProtocolInfo::ADD_BEHAVIOR_TREE_PACKET; /** @var string */ public $unknownString1; diff --git a/src/pocketmine/network/mcpe/protocol/AddEntityPacket.php b/src/pocketmine/network/mcpe/protocol/AddEntityPacket.php index 8ca614fb1..6df34a866 100644 --- a/src/pocketmine/network/mcpe/protocol/AddEntityPacket.php +++ b/src/pocketmine/network/mcpe/protocol/AddEntityPacket.php @@ -31,7 +31,7 @@ use pocketmine\network\mcpe\NetworkSession; use pocketmine\network\mcpe\protocol\types\EntityLink; class AddEntityPacket extends DataPacket{ - const NETWORK_ID = ProtocolInfo::ADD_ENTITY_PACKET; + public const NETWORK_ID = ProtocolInfo::ADD_ENTITY_PACKET; /** @var int|null */ public $entityUniqueId = null; //TODO diff --git a/src/pocketmine/network/mcpe/protocol/AddHangingEntityPacket.php b/src/pocketmine/network/mcpe/protocol/AddHangingEntityPacket.php index 201ce6260..1c97c107f 100644 --- a/src/pocketmine/network/mcpe/protocol/AddHangingEntityPacket.php +++ b/src/pocketmine/network/mcpe/protocol/AddHangingEntityPacket.php @@ -28,7 +28,7 @@ namespace pocketmine\network\mcpe\protocol; use pocketmine\network\mcpe\NetworkSession; class AddHangingEntityPacket extends DataPacket{ - const NETWORK_ID = ProtocolInfo::ADD_HANGING_ENTITY_PACKET; + public const NETWORK_ID = ProtocolInfo::ADD_HANGING_ENTITY_PACKET; /** @var int */ public $entityUniqueId; diff --git a/src/pocketmine/network/mcpe/protocol/AddItemEntityPacket.php b/src/pocketmine/network/mcpe/protocol/AddItemEntityPacket.php index 87946a95e..c8f059212 100644 --- a/src/pocketmine/network/mcpe/protocol/AddItemEntityPacket.php +++ b/src/pocketmine/network/mcpe/protocol/AddItemEntityPacket.php @@ -30,7 +30,7 @@ use pocketmine\math\Vector3; use pocketmine\network\mcpe\NetworkSession; class AddItemEntityPacket extends DataPacket{ - const NETWORK_ID = ProtocolInfo::ADD_ITEM_ENTITY_PACKET; + public const NETWORK_ID = ProtocolInfo::ADD_ITEM_ENTITY_PACKET; /** @var int|null */ public $entityUniqueId = null; //TODO diff --git a/src/pocketmine/network/mcpe/protocol/AddPaintingPacket.php b/src/pocketmine/network/mcpe/protocol/AddPaintingPacket.php index 550e393c4..ac905e347 100644 --- a/src/pocketmine/network/mcpe/protocol/AddPaintingPacket.php +++ b/src/pocketmine/network/mcpe/protocol/AddPaintingPacket.php @@ -29,7 +29,7 @@ namespace pocketmine\network\mcpe\protocol; use pocketmine\network\mcpe\NetworkSession; class AddPaintingPacket extends DataPacket{ - const NETWORK_ID = ProtocolInfo::ADD_PAINTING_PACKET; + public const NETWORK_ID = ProtocolInfo::ADD_PAINTING_PACKET; /** @var int|null */ public $entityUniqueId = null; //TODO diff --git a/src/pocketmine/network/mcpe/protocol/AddPlayerPacket.php b/src/pocketmine/network/mcpe/protocol/AddPlayerPacket.php index 2a9308f84..6b58f7ef4 100644 --- a/src/pocketmine/network/mcpe/protocol/AddPlayerPacket.php +++ b/src/pocketmine/network/mcpe/protocol/AddPlayerPacket.php @@ -32,7 +32,7 @@ use pocketmine\network\mcpe\protocol\types\EntityLink; use pocketmine\utils\UUID; class AddPlayerPacket extends DataPacket{ - const NETWORK_ID = ProtocolInfo::ADD_PLAYER_PACKET; + public const NETWORK_ID = ProtocolInfo::ADD_PLAYER_PACKET; /** @var UUID */ public $uuid; diff --git a/src/pocketmine/network/mcpe/protocol/AdventureSettingsPacket.php b/src/pocketmine/network/mcpe/protocol/AdventureSettingsPacket.php index b81ab67ce..72e5c5276 100644 --- a/src/pocketmine/network/mcpe/protocol/AdventureSettingsPacket.php +++ b/src/pocketmine/network/mcpe/protocol/AdventureSettingsPacket.php @@ -30,38 +30,38 @@ use pocketmine\network\mcpe\NetworkSession; use pocketmine\network\mcpe\protocol\types\PlayerPermissions; class AdventureSettingsPacket extends DataPacket{ - const NETWORK_ID = ProtocolInfo::ADVENTURE_SETTINGS_PACKET; + public const NETWORK_ID = ProtocolInfo::ADVENTURE_SETTINGS_PACKET; - const PERMISSION_NORMAL = 0; - const PERMISSION_OPERATOR = 1; - const PERMISSION_HOST = 2; - const PERMISSION_AUTOMATION = 3; - const PERMISSION_ADMIN = 4; + public const PERMISSION_NORMAL = 0; + public const PERMISSION_OPERATOR = 1; + public const PERMISSION_HOST = 2; + public const PERMISSION_AUTOMATION = 3; + public const PERMISSION_ADMIN = 4; /** * This constant is used to identify flags that should be set on the second field. In a sensible world, these * flags would all be set on the same packet field, but as of MCPE 1.2, the new abilities flags have for some * reason been assigned a separate field. */ - const BITFLAG_SECOND_SET = 1 << 16; + public const BITFLAG_SECOND_SET = 1 << 16; - const WORLD_IMMUTABLE = 0x01; - const NO_PVP = 0x02; + public const WORLD_IMMUTABLE = 0x01; + public const NO_PVP = 0x02; - const AUTO_JUMP = 0x20; - const ALLOW_FLIGHT = 0x40; - const NO_CLIP = 0x80; - const WORLD_BUILDER = 0x100; - const FLYING = 0x200; - const MUTED = 0x400; + public const AUTO_JUMP = 0x20; + public const ALLOW_FLIGHT = 0x40; + public const NO_CLIP = 0x80; + public const WORLD_BUILDER = 0x100; + public const FLYING = 0x200; + public const MUTED = 0x400; - const BUILD_AND_MINE = 0x01 | self::BITFLAG_SECOND_SET; - const DOORS_AND_SWITCHES = 0x02 | self::BITFLAG_SECOND_SET; - const OPEN_CONTAINERS = 0x04 | self::BITFLAG_SECOND_SET; - const ATTACK_PLAYERS = 0x08 | self::BITFLAG_SECOND_SET; - const ATTACK_MOBS = 0x10 | self::BITFLAG_SECOND_SET; - const OPERATOR = 0x20 | self::BITFLAG_SECOND_SET; - const TELEPORT = 0x80 | self::BITFLAG_SECOND_SET; + public const BUILD_AND_MINE = 0x01 | self::BITFLAG_SECOND_SET; + public const DOORS_AND_SWITCHES = 0x02 | self::BITFLAG_SECOND_SET; + public const OPEN_CONTAINERS = 0x04 | self::BITFLAG_SECOND_SET; + public const ATTACK_PLAYERS = 0x08 | self::BITFLAG_SECOND_SET; + public const ATTACK_MOBS = 0x10 | self::BITFLAG_SECOND_SET; + public const OPERATOR = 0x20 | self::BITFLAG_SECOND_SET; + public const TELEPORT = 0x80 | self::BITFLAG_SECOND_SET; /** @var int */ public $flags = 0; diff --git a/src/pocketmine/network/mcpe/protocol/AnimatePacket.php b/src/pocketmine/network/mcpe/protocol/AnimatePacket.php index fd4d0418e..177ae8991 100644 --- a/src/pocketmine/network/mcpe/protocol/AnimatePacket.php +++ b/src/pocketmine/network/mcpe/protocol/AnimatePacket.php @@ -29,12 +29,12 @@ namespace pocketmine\network\mcpe\protocol; use pocketmine\network\mcpe\NetworkSession; class AnimatePacket extends DataPacket{ - const NETWORK_ID = ProtocolInfo::ANIMATE_PACKET; + public const NETWORK_ID = ProtocolInfo::ANIMATE_PACKET; - const ACTION_SWING_ARM = 1; + public const ACTION_SWING_ARM = 1; - const ACTION_STOP_SLEEP = 3; - const ACTION_CRITICAL_HIT = 4; + public const ACTION_STOP_SLEEP = 3; + public const ACTION_CRITICAL_HIT = 4; /** @var int */ public $action; diff --git a/src/pocketmine/network/mcpe/protocol/AvailableCommandsPacket.php b/src/pocketmine/network/mcpe/protocol/AvailableCommandsPacket.php index 1583687d7..cfbb1c6d1 100644 --- a/src/pocketmine/network/mcpe/protocol/AvailableCommandsPacket.php +++ b/src/pocketmine/network/mcpe/protocol/AvailableCommandsPacket.php @@ -28,45 +28,45 @@ namespace pocketmine\network\mcpe\protocol; use pocketmine\network\mcpe\NetworkSession; class AvailableCommandsPacket extends DataPacket{ - const NETWORK_ID = ProtocolInfo::AVAILABLE_COMMANDS_PACKET; + public const NETWORK_ID = ProtocolInfo::AVAILABLE_COMMANDS_PACKET; /** * This flag is set on all types EXCEPT the TEMPLATE type. Not completely sure what this is for, but it is required * for the argtype to work correctly. VALID seems as good a name as any. */ - const ARG_FLAG_VALID = 0x100000; + public const ARG_FLAG_VALID = 0x100000; /** * Basic parameter types. These must be combined with the ARG_FLAG_VALID constant. * ARG_FLAG_VALID | (type const) */ - const ARG_TYPE_INT = 0x01; - const ARG_TYPE_FLOAT = 0x02; - const ARG_TYPE_VALUE = 0x03; - const ARG_TYPE_TARGET = 0x04; + public const ARG_TYPE_INT = 0x01; + public const ARG_TYPE_FLOAT = 0x02; + public const ARG_TYPE_VALUE = 0x03; + public const ARG_TYPE_TARGET = 0x04; - const ARG_TYPE_STRING = 0x0d; - const ARG_TYPE_POSITION = 0x0e; + public const ARG_TYPE_STRING = 0x0d; + public const ARG_TYPE_POSITION = 0x0e; - const ARG_TYPE_RAWTEXT = 0x11; + public const ARG_TYPE_RAWTEXT = 0x11; - const ARG_TYPE_TEXT = 0x13; + public const ARG_TYPE_TEXT = 0x13; - const ARG_TYPE_JSON = 0x16; + public const ARG_TYPE_JSON = 0x16; - const ARG_TYPE_COMMAND = 0x1d; + public const ARG_TYPE_COMMAND = 0x1d; /** * Enums are a little different: they are composed as follows: * ARG_FLAG_ENUM | ARG_FLAG_VALID | (enum index) */ - const ARG_FLAG_ENUM = 0x200000; + public const ARG_FLAG_ENUM = 0x200000; /** * This is used for for /xp L. */ - const ARG_FLAG_POSTFIX = 0x1000000; + public const ARG_FLAG_POSTFIX = 0x1000000; /** * @var string[] diff --git a/src/pocketmine/network/mcpe/protocol/BatchPacket.php b/src/pocketmine/network/mcpe/protocol/BatchPacket.php index 1a7b949ad..df66f3296 100644 --- a/src/pocketmine/network/mcpe/protocol/BatchPacket.php +++ b/src/pocketmine/network/mcpe/protocol/BatchPacket.php @@ -33,7 +33,7 @@ use pocketmine\utils\Binary; use pocketmine\utils\BinaryStream; class BatchPacket extends DataPacket{ - const NETWORK_ID = 0xfe; + public const NETWORK_ID = 0xfe; /** @var string */ public $payload = ""; diff --git a/src/pocketmine/network/mcpe/protocol/BlockEntityDataPacket.php b/src/pocketmine/network/mcpe/protocol/BlockEntityDataPacket.php index 5f2d743b2..c1aa4c169 100644 --- a/src/pocketmine/network/mcpe/protocol/BlockEntityDataPacket.php +++ b/src/pocketmine/network/mcpe/protocol/BlockEntityDataPacket.php @@ -29,7 +29,7 @@ namespace pocketmine\network\mcpe\protocol; use pocketmine\network\mcpe\NetworkSession; class BlockEntityDataPacket extends DataPacket{ - const NETWORK_ID = ProtocolInfo::BLOCK_ENTITY_DATA_PACKET; + public const NETWORK_ID = ProtocolInfo::BLOCK_ENTITY_DATA_PACKET; /** @var int */ public $x; diff --git a/src/pocketmine/network/mcpe/protocol/BlockEventPacket.php b/src/pocketmine/network/mcpe/protocol/BlockEventPacket.php index 576bfeaa1..3433cbc14 100644 --- a/src/pocketmine/network/mcpe/protocol/BlockEventPacket.php +++ b/src/pocketmine/network/mcpe/protocol/BlockEventPacket.php @@ -29,7 +29,7 @@ namespace pocketmine\network\mcpe\protocol; use pocketmine\network\mcpe\NetworkSession; class BlockEventPacket extends DataPacket{ - const NETWORK_ID = ProtocolInfo::BLOCK_EVENT_PACKET; + public const NETWORK_ID = ProtocolInfo::BLOCK_EVENT_PACKET; /** @var int */ public $x; diff --git a/src/pocketmine/network/mcpe/protocol/BlockPickRequestPacket.php b/src/pocketmine/network/mcpe/protocol/BlockPickRequestPacket.php index 4ac8f9267..59021543a 100644 --- a/src/pocketmine/network/mcpe/protocol/BlockPickRequestPacket.php +++ b/src/pocketmine/network/mcpe/protocol/BlockPickRequestPacket.php @@ -30,7 +30,7 @@ namespace pocketmine\network\mcpe\protocol; use pocketmine\network\mcpe\NetworkSession; class BlockPickRequestPacket extends DataPacket{ - const NETWORK_ID = ProtocolInfo::BLOCK_PICK_REQUEST_PACKET; + public const NETWORK_ID = ProtocolInfo::BLOCK_PICK_REQUEST_PACKET; /** @var int */ public $blockX; diff --git a/src/pocketmine/network/mcpe/protocol/BookEditPacket.php b/src/pocketmine/network/mcpe/protocol/BookEditPacket.php index cb9d312db..a0296a698 100644 --- a/src/pocketmine/network/mcpe/protocol/BookEditPacket.php +++ b/src/pocketmine/network/mcpe/protocol/BookEditPacket.php @@ -28,13 +28,13 @@ namespace pocketmine\network\mcpe\protocol; use pocketmine\network\mcpe\NetworkSession; class BookEditPacket extends DataPacket{ - const NETWORK_ID = ProtocolInfo::BOOK_EDIT_PACKET; + public const NETWORK_ID = ProtocolInfo::BOOK_EDIT_PACKET; - const TYPE_REPLACE_PAGE = 0; - const TYPE_ADD_PAGE = 1; - const TYPE_DELETE_PAGE = 2; - const TYPE_SWAP_PAGES = 3; - const TYPE_SIGN_BOOK = 4; + public const TYPE_REPLACE_PAGE = 0; + public const TYPE_ADD_PAGE = 1; + public const TYPE_DELETE_PAGE = 2; + public const TYPE_SWAP_PAGES = 3; + public const TYPE_SIGN_BOOK = 4; /** @var int */ public $type; diff --git a/src/pocketmine/network/mcpe/protocol/BossEventPacket.php b/src/pocketmine/network/mcpe/protocol/BossEventPacket.php index ba9ac9086..ceabb60f1 100644 --- a/src/pocketmine/network/mcpe/protocol/BossEventPacket.php +++ b/src/pocketmine/network/mcpe/protocol/BossEventPacket.php @@ -29,24 +29,24 @@ namespace pocketmine\network\mcpe\protocol; use pocketmine\network\mcpe\NetworkSession; class BossEventPacket extends DataPacket{ - const NETWORK_ID = ProtocolInfo::BOSS_EVENT_PACKET; + public const NETWORK_ID = ProtocolInfo::BOSS_EVENT_PACKET; /* S2C: Shows the boss-bar to the player. */ - const TYPE_SHOW = 0; + public const TYPE_SHOW = 0; /* C2S: Registers a player to a boss fight. */ - const TYPE_REGISTER_PLAYER = 1; + public const TYPE_REGISTER_PLAYER = 1; /* S2C: Removes the boss-bar from the client. */ - const TYPE_HIDE = 2; + public const TYPE_HIDE = 2; /* C2S: Unregisters a player from a boss fight. */ - const TYPE_UNREGISTER_PLAYER = 3; + public const TYPE_UNREGISTER_PLAYER = 3; /* S2C: Appears not to be implemented. Currently bar percentage only appears to change in response to the target entity's health. */ - const TYPE_HEALTH_PERCENT = 4; + public const TYPE_HEALTH_PERCENT = 4; /* S2C: Also appears to not be implemented. Title client-side sticks as the target entity's nametag, or their entity type name if not set. */ - const TYPE_TITLE = 5; + public const TYPE_TITLE = 5; /* S2C: Not sure on this. Includes color and overlay fields, plus an unknown short. TODO: check this */ - const TYPE_UNKNOWN_6 = 6; + public const TYPE_UNKNOWN_6 = 6; /* S2C: Not implemented :( Intended to alter bar appearance, but these currently produce no effect on client-side whatsoever. */ - const TYPE_TEXTURE = 7; + public const TYPE_TEXTURE = 7; /** @var int */ public $bossEid; diff --git a/src/pocketmine/network/mcpe/protocol/CameraPacket.php b/src/pocketmine/network/mcpe/protocol/CameraPacket.php index 6ed239b9a..19d11f804 100644 --- a/src/pocketmine/network/mcpe/protocol/CameraPacket.php +++ b/src/pocketmine/network/mcpe/protocol/CameraPacket.php @@ -28,7 +28,7 @@ namespace pocketmine\network\mcpe\protocol; use pocketmine\network\mcpe\NetworkSession; class CameraPacket extends DataPacket{ - const NETWORK_ID = ProtocolInfo::CAMERA_PACKET; + public const NETWORK_ID = ProtocolInfo::CAMERA_PACKET; /** @var int */ public $cameraUniqueId; diff --git a/src/pocketmine/network/mcpe/protocol/ChangeDimensionPacket.php b/src/pocketmine/network/mcpe/protocol/ChangeDimensionPacket.php index 3c77f9c6a..5c6b0bac4 100644 --- a/src/pocketmine/network/mcpe/protocol/ChangeDimensionPacket.php +++ b/src/pocketmine/network/mcpe/protocol/ChangeDimensionPacket.php @@ -30,7 +30,7 @@ use pocketmine\math\Vector3; use pocketmine\network\mcpe\NetworkSession; class ChangeDimensionPacket extends DataPacket{ - const NETWORK_ID = ProtocolInfo::CHANGE_DIMENSION_PACKET; + public const NETWORK_ID = ProtocolInfo::CHANGE_DIMENSION_PACKET; /** @var int */ public $dimension; diff --git a/src/pocketmine/network/mcpe/protocol/ChunkRadiusUpdatedPacket.php b/src/pocketmine/network/mcpe/protocol/ChunkRadiusUpdatedPacket.php index bb5d57276..4b2605985 100644 --- a/src/pocketmine/network/mcpe/protocol/ChunkRadiusUpdatedPacket.php +++ b/src/pocketmine/network/mcpe/protocol/ChunkRadiusUpdatedPacket.php @@ -29,7 +29,7 @@ namespace pocketmine\network\mcpe\protocol; use pocketmine\network\mcpe\NetworkSession; class ChunkRadiusUpdatedPacket extends DataPacket{ - const NETWORK_ID = ProtocolInfo::CHUNK_RADIUS_UPDATED_PACKET; + public const NETWORK_ID = ProtocolInfo::CHUNK_RADIUS_UPDATED_PACKET; /** @var int */ public $radius; diff --git a/src/pocketmine/network/mcpe/protocol/ClientToServerHandshakePacket.php b/src/pocketmine/network/mcpe/protocol/ClientToServerHandshakePacket.php index 4658e9e1c..a4a564109 100644 --- a/src/pocketmine/network/mcpe/protocol/ClientToServerHandshakePacket.php +++ b/src/pocketmine/network/mcpe/protocol/ClientToServerHandshakePacket.php @@ -29,7 +29,7 @@ namespace pocketmine\network\mcpe\protocol; use pocketmine\network\mcpe\NetworkSession; class ClientToServerHandshakePacket extends DataPacket{ - const NETWORK_ID = ProtocolInfo::CLIENT_TO_SERVER_HANDSHAKE_PACKET; + public const NETWORK_ID = ProtocolInfo::CLIENT_TO_SERVER_HANDSHAKE_PACKET; public function canBeSentBeforeLogin() : bool{ return true; diff --git a/src/pocketmine/network/mcpe/protocol/ClientboundMapItemDataPacket.php b/src/pocketmine/network/mcpe/protocol/ClientboundMapItemDataPacket.php index 502b9bd33..5bf1b0915 100644 --- a/src/pocketmine/network/mcpe/protocol/ClientboundMapItemDataPacket.php +++ b/src/pocketmine/network/mcpe/protocol/ClientboundMapItemDataPacket.php @@ -32,10 +32,10 @@ use pocketmine\network\mcpe\protocol\types\DimensionIds; use pocketmine\utils\Color; class ClientboundMapItemDataPacket extends DataPacket{ - const NETWORK_ID = ProtocolInfo::CLIENTBOUND_MAP_ITEM_DATA_PACKET; + public const NETWORK_ID = ProtocolInfo::CLIENTBOUND_MAP_ITEM_DATA_PACKET; - const BITFLAG_TEXTURE_UPDATE = 0x02; - const BITFLAG_DECORATION_UPDATE = 0x04; + public const BITFLAG_TEXTURE_UPDATE = 0x02; + public const BITFLAG_DECORATION_UPDATE = 0x04; /** @var int */ public $mapId; diff --git a/src/pocketmine/network/mcpe/protocol/CommandBlockUpdatePacket.php b/src/pocketmine/network/mcpe/protocol/CommandBlockUpdatePacket.php index f6fdaddaf..a69c929d5 100644 --- a/src/pocketmine/network/mcpe/protocol/CommandBlockUpdatePacket.php +++ b/src/pocketmine/network/mcpe/protocol/CommandBlockUpdatePacket.php @@ -30,7 +30,7 @@ namespace pocketmine\network\mcpe\protocol; use pocketmine\network\mcpe\NetworkSession; class CommandBlockUpdatePacket extends DataPacket{ - const NETWORK_ID = ProtocolInfo::COMMAND_BLOCK_UPDATE_PACKET; + public const NETWORK_ID = ProtocolInfo::COMMAND_BLOCK_UPDATE_PACKET; /** @var bool */ public $isBlock; diff --git a/src/pocketmine/network/mcpe/protocol/CommandOutputPacket.php b/src/pocketmine/network/mcpe/protocol/CommandOutputPacket.php index 0cc331c10..eee3cbb4f 100644 --- a/src/pocketmine/network/mcpe/protocol/CommandOutputPacket.php +++ b/src/pocketmine/network/mcpe/protocol/CommandOutputPacket.php @@ -28,7 +28,7 @@ namespace pocketmine\network\mcpe\protocol; use pocketmine\network\mcpe\NetworkSession; class CommandOutputPacket extends DataPacket{ - const NETWORK_ID = ProtocolInfo::COMMAND_OUTPUT_PACKET; + public const NETWORK_ID = ProtocolInfo::COMMAND_OUTPUT_PACKET; protected function decodePayload(){ //TODO diff --git a/src/pocketmine/network/mcpe/protocol/CommandRequestPacket.php b/src/pocketmine/network/mcpe/protocol/CommandRequestPacket.php index 5a1490669..565389850 100644 --- a/src/pocketmine/network/mcpe/protocol/CommandRequestPacket.php +++ b/src/pocketmine/network/mcpe/protocol/CommandRequestPacket.php @@ -28,7 +28,7 @@ namespace pocketmine\network\mcpe\protocol; use pocketmine\network\mcpe\NetworkSession; class CommandRequestPacket extends DataPacket{ - const NETWORK_ID = ProtocolInfo::COMMAND_REQUEST_PACKET; + public const NETWORK_ID = ProtocolInfo::COMMAND_REQUEST_PACKET; /** @var string */ public $command; diff --git a/src/pocketmine/network/mcpe/protocol/ContainerClosePacket.php b/src/pocketmine/network/mcpe/protocol/ContainerClosePacket.php index 8147867f0..2a6766e9b 100644 --- a/src/pocketmine/network/mcpe/protocol/ContainerClosePacket.php +++ b/src/pocketmine/network/mcpe/protocol/ContainerClosePacket.php @@ -29,7 +29,7 @@ namespace pocketmine\network\mcpe\protocol; use pocketmine\network\mcpe\NetworkSession; class ContainerClosePacket extends DataPacket{ - const NETWORK_ID = ProtocolInfo::CONTAINER_CLOSE_PACKET; + public const NETWORK_ID = ProtocolInfo::CONTAINER_CLOSE_PACKET; /** @var int */ public $windowId; diff --git a/src/pocketmine/network/mcpe/protocol/ContainerOpenPacket.php b/src/pocketmine/network/mcpe/protocol/ContainerOpenPacket.php index e9a60cd73..9a6adbca7 100644 --- a/src/pocketmine/network/mcpe/protocol/ContainerOpenPacket.php +++ b/src/pocketmine/network/mcpe/protocol/ContainerOpenPacket.php @@ -29,7 +29,7 @@ namespace pocketmine\network\mcpe\protocol; use pocketmine\network\mcpe\NetworkSession; class ContainerOpenPacket extends DataPacket{ - const NETWORK_ID = ProtocolInfo::CONTAINER_OPEN_PACKET; + public const NETWORK_ID = ProtocolInfo::CONTAINER_OPEN_PACKET; /** @var int */ public $windowId; diff --git a/src/pocketmine/network/mcpe/protocol/ContainerSetDataPacket.php b/src/pocketmine/network/mcpe/protocol/ContainerSetDataPacket.php index 91e183e93..0daef0a10 100644 --- a/src/pocketmine/network/mcpe/protocol/ContainerSetDataPacket.php +++ b/src/pocketmine/network/mcpe/protocol/ContainerSetDataPacket.php @@ -29,17 +29,17 @@ namespace pocketmine\network\mcpe\protocol; use pocketmine\network\mcpe\NetworkSession; class ContainerSetDataPacket extends DataPacket{ - const NETWORK_ID = ProtocolInfo::CONTAINER_SET_DATA_PACKET; + public const NETWORK_ID = ProtocolInfo::CONTAINER_SET_DATA_PACKET; - const PROPERTY_FURNACE_TICK_COUNT = 0; - const PROPERTY_FURNACE_LIT_TIME = 1; - const PROPERTY_FURNACE_LIT_DURATION = 2; + public const PROPERTY_FURNACE_TICK_COUNT = 0; + public const PROPERTY_FURNACE_LIT_TIME = 1; + public const PROPERTY_FURNACE_LIT_DURATION = 2; //TODO: check property 3 - const PROPERTY_FURNACE_FUEL_AUX = 4; + public const PROPERTY_FURNACE_FUEL_AUX = 4; - const PROPERTY_BREWING_STAND_BREW_TIME = 0; - const PROPERTY_BREWING_STAND_FUEL_AMOUNT = 1; - const PROPERTY_BREWING_STAND_FUEL_TOTAL = 2; + public const PROPERTY_BREWING_STAND_BREW_TIME = 0; + public const PROPERTY_BREWING_STAND_FUEL_AMOUNT = 1; + public const PROPERTY_BREWING_STAND_FUEL_TOTAL = 2; /** @var int */ public $windowId; diff --git a/src/pocketmine/network/mcpe/protocol/CraftingDataPacket.php b/src/pocketmine/network/mcpe/protocol/CraftingDataPacket.php index 0801dbf5d..18f8334f0 100644 --- a/src/pocketmine/network/mcpe/protocol/CraftingDataPacket.php +++ b/src/pocketmine/network/mcpe/protocol/CraftingDataPacket.php @@ -34,14 +34,14 @@ use pocketmine\network\mcpe\NetworkSession; use pocketmine\utils\BinaryStream; class CraftingDataPacket extends DataPacket{ - const NETWORK_ID = ProtocolInfo::CRAFTING_DATA_PACKET; + public const NETWORK_ID = ProtocolInfo::CRAFTING_DATA_PACKET; - const ENTRY_SHAPELESS = 0; - const ENTRY_SHAPED = 1; - const ENTRY_FURNACE = 2; - const ENTRY_FURNACE_DATA = 3; - const ENTRY_MULTI = 4; //TODO - const ENTRY_SHULKER_BOX = 5; //TODO + public const ENTRY_SHAPELESS = 0; + public const ENTRY_SHAPED = 1; + public const ENTRY_FURNACE = 2; + public const ENTRY_FURNACE_DATA = 3; + public const ENTRY_MULTI = 4; //TODO + public const ENTRY_SHULKER_BOX = 5; //TODO /** @var object[] */ public $entries = []; diff --git a/src/pocketmine/network/mcpe/protocol/CraftingEventPacket.php b/src/pocketmine/network/mcpe/protocol/CraftingEventPacket.php index 3c35ae7f3..b18214acb 100644 --- a/src/pocketmine/network/mcpe/protocol/CraftingEventPacket.php +++ b/src/pocketmine/network/mcpe/protocol/CraftingEventPacket.php @@ -30,7 +30,7 @@ use pocketmine\network\mcpe\NetworkSession; use pocketmine\utils\UUID; class CraftingEventPacket extends DataPacket{ - const NETWORK_ID = ProtocolInfo::CRAFTING_EVENT_PACKET; + public const NETWORK_ID = ProtocolInfo::CRAFTING_EVENT_PACKET; /** @var int */ public $windowId; diff --git a/src/pocketmine/network/mcpe/protocol/DataPacket.php b/src/pocketmine/network/mcpe/protocol/DataPacket.php index 908635dae..c992aee10 100644 --- a/src/pocketmine/network/mcpe/protocol/DataPacket.php +++ b/src/pocketmine/network/mcpe/protocol/DataPacket.php @@ -37,7 +37,7 @@ use pocketmine\utils\Utils; abstract class DataPacket extends BinaryStream{ - const NETWORK_ID = 0; + public const NETWORK_ID = 0; /** @var bool */ public $isEncoded = false; diff --git a/src/pocketmine/network/mcpe/protocol/DisconnectPacket.php b/src/pocketmine/network/mcpe/protocol/DisconnectPacket.php index 62c8345e4..f90f17cb7 100644 --- a/src/pocketmine/network/mcpe/protocol/DisconnectPacket.php +++ b/src/pocketmine/network/mcpe/protocol/DisconnectPacket.php @@ -29,7 +29,7 @@ namespace pocketmine\network\mcpe\protocol; use pocketmine\network\mcpe\NetworkSession; class DisconnectPacket extends DataPacket{ - const NETWORK_ID = ProtocolInfo::DISCONNECT_PACKET; + public const NETWORK_ID = ProtocolInfo::DISCONNECT_PACKET; /** @var bool */ public $hideDisconnectionScreen = false; diff --git a/src/pocketmine/network/mcpe/protocol/EntityEventPacket.php b/src/pocketmine/network/mcpe/protocol/EntityEventPacket.php index 9f126002e..40041448c 100644 --- a/src/pocketmine/network/mcpe/protocol/EntityEventPacket.php +++ b/src/pocketmine/network/mcpe/protocol/EntityEventPacket.php @@ -29,56 +29,56 @@ namespace pocketmine\network\mcpe\protocol; use pocketmine\network\mcpe\NetworkSession; class EntityEventPacket extends DataPacket{ - const NETWORK_ID = ProtocolInfo::ENTITY_EVENT_PACKET; + public const NETWORK_ID = ProtocolInfo::ENTITY_EVENT_PACKET; - const HURT_ANIMATION = 2; - const DEATH_ANIMATION = 3; - const ARM_SWING = 4; + public const HURT_ANIMATION = 2; + public const DEATH_ANIMATION = 3; + public const ARM_SWING = 4; - const TAME_FAIL = 6; - const TAME_SUCCESS = 7; - const SHAKE_WET = 8; - const USE_ITEM = 9; - const EAT_GRASS_ANIMATION = 10; - const FISH_HOOK_BUBBLE = 11; - const FISH_HOOK_POSITION = 12; - const FISH_HOOK_HOOK = 13; - const FISH_HOOK_TEASE = 14; - const SQUID_INK_CLOUD = 15; - const ZOMBIE_VILLAGER_CURE = 16; + public const TAME_FAIL = 6; + public const TAME_SUCCESS = 7; + public const SHAKE_WET = 8; + public const USE_ITEM = 9; + public const EAT_GRASS_ANIMATION = 10; + public const FISH_HOOK_BUBBLE = 11; + public const FISH_HOOK_POSITION = 12; + public const FISH_HOOK_HOOK = 13; + public const FISH_HOOK_TEASE = 14; + public const SQUID_INK_CLOUD = 15; + public const ZOMBIE_VILLAGER_CURE = 16; - const RESPAWN = 18; - const IRON_GOLEM_OFFER_FLOWER = 19; - const IRON_GOLEM_WITHDRAW_FLOWER = 20; - const LOVE_PARTICLES = 21; //breeding + public const RESPAWN = 18; + public const IRON_GOLEM_OFFER_FLOWER = 19; + public const IRON_GOLEM_WITHDRAW_FLOWER = 20; + public const LOVE_PARTICLES = 21; //breeding - const WITCH_SPELL_PARTICLES = 24; - const FIREWORK_PARTICLES = 25; + public const WITCH_SPELL_PARTICLES = 24; + public const FIREWORK_PARTICLES = 25; - const SILVERFISH_SPAWN_ANIMATION = 27; + public const SILVERFISH_SPAWN_ANIMATION = 27; - const WITCH_DRINK_POTION = 29; - const WITCH_THROW_POTION = 30; - const MINECART_TNT_PRIME_FUSE = 31; + public const WITCH_DRINK_POTION = 29; + public const WITCH_THROW_POTION = 30; + public const MINECART_TNT_PRIME_FUSE = 31; - const PLAYER_ADD_XP_LEVELS = 34; - const ELDER_GUARDIAN_CURSE = 35; - const AGENT_ARM_SWING = 36; - const ENDER_DRAGON_DEATH = 37; - const DUST_PARTICLES = 38; //not sure what this is + public const PLAYER_ADD_XP_LEVELS = 34; + public const ELDER_GUARDIAN_CURSE = 35; + public const AGENT_ARM_SWING = 36; + public const ENDER_DRAGON_DEATH = 37; + public const DUST_PARTICLES = 38; //not sure what this is - const EATING_ITEM = 57; + public const EATING_ITEM = 57; - const BABY_ANIMAL_FEED = 60; //green particles, like bonemeal on crops - const DEATH_SMOKE_CLOUD = 61; - const COMPLETE_TRADE = 62; - const REMOVE_LEASH = 63; //data 1 = cut leash + public const BABY_ANIMAL_FEED = 60; //green particles, like bonemeal on crops + public const DEATH_SMOKE_CLOUD = 61; + public const COMPLETE_TRADE = 62; + public const REMOVE_LEASH = 63; //data 1 = cut leash - const CONSUME_TOTEM = 65; - const PLAYER_CHECK_TREASURE_HUNTER_ACHIEVEMENT = 66; //mojang... - const ENTITY_SPAWN = 67; //used for MinecraftEventing stuff, not needed - const DRAGON_PUKE = 68; //they call this puke particles - const ITEM_ENTITY_MERGE = 69; + public const CONSUME_TOTEM = 65; + public const PLAYER_CHECK_TREASURE_HUNTER_ACHIEVEMENT = 66; //mojang... + public const ENTITY_SPAWN = 67; //used for MinecraftEventing stuff, not needed + public const DRAGON_PUKE = 68; //they call this puke particles + public const ITEM_ENTITY_MERGE = 69; //TODO: add more events diff --git a/src/pocketmine/network/mcpe/protocol/EntityFallPacket.php b/src/pocketmine/network/mcpe/protocol/EntityFallPacket.php index 92b707520..223aede76 100644 --- a/src/pocketmine/network/mcpe/protocol/EntityFallPacket.php +++ b/src/pocketmine/network/mcpe/protocol/EntityFallPacket.php @@ -29,7 +29,7 @@ namespace pocketmine\network\mcpe\protocol; use pocketmine\network\mcpe\NetworkSession; class EntityFallPacket extends DataPacket{ - const NETWORK_ID = ProtocolInfo::ENTITY_FALL_PACKET; + public const NETWORK_ID = ProtocolInfo::ENTITY_FALL_PACKET; /** @var int */ public $entityRuntimeId; diff --git a/src/pocketmine/network/mcpe/protocol/EntityPickRequestPacket.php b/src/pocketmine/network/mcpe/protocol/EntityPickRequestPacket.php index e893c7783..3f2709233 100644 --- a/src/pocketmine/network/mcpe/protocol/EntityPickRequestPacket.php +++ b/src/pocketmine/network/mcpe/protocol/EntityPickRequestPacket.php @@ -28,7 +28,7 @@ namespace pocketmine\network\mcpe\protocol; use pocketmine\network\mcpe\NetworkSession; class EntityPickRequestPacket extends DataPacket{ - const NETWORK_ID = ProtocolInfo::ENTITY_PICK_REQUEST_PACKET; + public const NETWORK_ID = ProtocolInfo::ENTITY_PICK_REQUEST_PACKET; /** @var int */ public $entityUniqueId; diff --git a/src/pocketmine/network/mcpe/protocol/EventPacket.php b/src/pocketmine/network/mcpe/protocol/EventPacket.php index 5c8f86384..05544a7db 100644 --- a/src/pocketmine/network/mcpe/protocol/EventPacket.php +++ b/src/pocketmine/network/mcpe/protocol/EventPacket.php @@ -28,18 +28,18 @@ namespace pocketmine\network\mcpe\protocol; use pocketmine\network\mcpe\NetworkSession; class EventPacket extends DataPacket{ - const NETWORK_ID = ProtocolInfo::EVENT_PACKET; + public const NETWORK_ID = ProtocolInfo::EVENT_PACKET; - const TYPE_ACHIEVEMENT_AWARDED = 0; - const TYPE_ENTITY_INTERACT = 1; - const TYPE_PORTAL_BUILT = 2; - const TYPE_PORTAL_USED = 3; - const TYPE_MOB_KILLED = 4; - const TYPE_CAULDRON_USED = 5; - const TYPE_PLAYER_DEATH = 6; - const TYPE_BOSS_KILLED = 7; - const TYPE_AGENT_COMMAND = 8; - const TYPE_AGENT_CREATED = 9; + public const TYPE_ACHIEVEMENT_AWARDED = 0; + public const TYPE_ENTITY_INTERACT = 1; + public const TYPE_PORTAL_BUILT = 2; + public const TYPE_PORTAL_USED = 3; + public const TYPE_MOB_KILLED = 4; + public const TYPE_CAULDRON_USED = 5; + public const TYPE_PLAYER_DEATH = 6; + public const TYPE_BOSS_KILLED = 7; + public const TYPE_AGENT_COMMAND = 8; + public const TYPE_AGENT_CREATED = 9; /** @var int */ public $playerRuntimeId; diff --git a/src/pocketmine/network/mcpe/protocol/ExplodePacket.php b/src/pocketmine/network/mcpe/protocol/ExplodePacket.php index e7a27f211..c2a384969 100644 --- a/src/pocketmine/network/mcpe/protocol/ExplodePacket.php +++ b/src/pocketmine/network/mcpe/protocol/ExplodePacket.php @@ -30,7 +30,7 @@ use pocketmine\math\Vector3; use pocketmine\network\mcpe\NetworkSession; class ExplodePacket extends DataPacket{ - const NETWORK_ID = ProtocolInfo::EXPLODE_PACKET; + public const NETWORK_ID = ProtocolInfo::EXPLODE_PACKET; /** @var Vector3 */ public $position; diff --git a/src/pocketmine/network/mcpe/protocol/FullChunkDataPacket.php b/src/pocketmine/network/mcpe/protocol/FullChunkDataPacket.php index 1e426b21f..fe5aa73e0 100644 --- a/src/pocketmine/network/mcpe/protocol/FullChunkDataPacket.php +++ b/src/pocketmine/network/mcpe/protocol/FullChunkDataPacket.php @@ -29,7 +29,7 @@ namespace pocketmine\network\mcpe\protocol; use pocketmine\network\mcpe\NetworkSession; class FullChunkDataPacket extends DataPacket{ - const NETWORK_ID = ProtocolInfo::FULL_CHUNK_DATA_PACKET; + public const NETWORK_ID = ProtocolInfo::FULL_CHUNK_DATA_PACKET; /** @var int */ public $chunkX; diff --git a/src/pocketmine/network/mcpe/protocol/GameRulesChangedPacket.php b/src/pocketmine/network/mcpe/protocol/GameRulesChangedPacket.php index 2a535cd1a..0028fe2cd 100644 --- a/src/pocketmine/network/mcpe/protocol/GameRulesChangedPacket.php +++ b/src/pocketmine/network/mcpe/protocol/GameRulesChangedPacket.php @@ -28,7 +28,7 @@ namespace pocketmine\network\mcpe\protocol; use pocketmine\network\mcpe\NetworkSession; class GameRulesChangedPacket extends DataPacket{ - const NETWORK_ID = ProtocolInfo::GAME_RULES_CHANGED_PACKET; + public const NETWORK_ID = ProtocolInfo::GAME_RULES_CHANGED_PACKET; /** @var array */ public $gameRules = []; diff --git a/src/pocketmine/network/mcpe/protocol/GuiDataPickItemPacket.php b/src/pocketmine/network/mcpe/protocol/GuiDataPickItemPacket.php index 72c930a62..f00699059 100644 --- a/src/pocketmine/network/mcpe/protocol/GuiDataPickItemPacket.php +++ b/src/pocketmine/network/mcpe/protocol/GuiDataPickItemPacket.php @@ -28,7 +28,7 @@ namespace pocketmine\network\mcpe\protocol; use pocketmine\network\mcpe\NetworkSession; class GuiDataPickItemPacket extends DataPacket{ - const NETWORK_ID = ProtocolInfo::GUI_DATA_PICK_ITEM_PACKET; + public const NETWORK_ID = ProtocolInfo::GUI_DATA_PICK_ITEM_PACKET; /** @var int */ public $hotbarSlot; diff --git a/src/pocketmine/network/mcpe/protocol/HurtArmorPacket.php b/src/pocketmine/network/mcpe/protocol/HurtArmorPacket.php index bb407565d..f7ffa3d27 100644 --- a/src/pocketmine/network/mcpe/protocol/HurtArmorPacket.php +++ b/src/pocketmine/network/mcpe/protocol/HurtArmorPacket.php @@ -29,7 +29,7 @@ namespace pocketmine\network\mcpe\protocol; use pocketmine\network\mcpe\NetworkSession; class HurtArmorPacket extends DataPacket{ - const NETWORK_ID = ProtocolInfo::HURT_ARMOR_PACKET; + public const NETWORK_ID = ProtocolInfo::HURT_ARMOR_PACKET; /** @var int */ public $health; diff --git a/src/pocketmine/network/mcpe/protocol/InteractPacket.php b/src/pocketmine/network/mcpe/protocol/InteractPacket.php index 37a9e2053..768d53f99 100644 --- a/src/pocketmine/network/mcpe/protocol/InteractPacket.php +++ b/src/pocketmine/network/mcpe/protocol/InteractPacket.php @@ -29,12 +29,12 @@ namespace pocketmine\network\mcpe\protocol; use pocketmine\network\mcpe\NetworkSession; class InteractPacket extends DataPacket{ - const NETWORK_ID = ProtocolInfo::INTERACT_PACKET; + public const NETWORK_ID = ProtocolInfo::INTERACT_PACKET; - const ACTION_LEAVE_VEHICLE = 3; - const ACTION_MOUSEOVER = 4; + public const ACTION_LEAVE_VEHICLE = 3; + public const ACTION_MOUSEOVER = 4; - const ACTION_OPEN_INVENTORY = 6; + public const ACTION_OPEN_INVENTORY = 6; /** @var int */ public $action; diff --git a/src/pocketmine/network/mcpe/protocol/InventoryContentPacket.php b/src/pocketmine/network/mcpe/protocol/InventoryContentPacket.php index 33e33c0f3..34e0e254a 100644 --- a/src/pocketmine/network/mcpe/protocol/InventoryContentPacket.php +++ b/src/pocketmine/network/mcpe/protocol/InventoryContentPacket.php @@ -29,7 +29,7 @@ use pocketmine\item\Item; use pocketmine\network\mcpe\NetworkSession; class InventoryContentPacket extends DataPacket{ - const NETWORK_ID = ProtocolInfo::INVENTORY_CONTENT_PACKET; + public const NETWORK_ID = ProtocolInfo::INVENTORY_CONTENT_PACKET; /** @var int */ public $windowId; diff --git a/src/pocketmine/network/mcpe/protocol/InventorySlotPacket.php b/src/pocketmine/network/mcpe/protocol/InventorySlotPacket.php index 95914bd44..7e0c038d7 100644 --- a/src/pocketmine/network/mcpe/protocol/InventorySlotPacket.php +++ b/src/pocketmine/network/mcpe/protocol/InventorySlotPacket.php @@ -29,7 +29,7 @@ use pocketmine\item\Item; use pocketmine\network\mcpe\NetworkSession; class InventorySlotPacket extends DataPacket{ - const NETWORK_ID = ProtocolInfo::INVENTORY_SLOT_PACKET; + public const NETWORK_ID = ProtocolInfo::INVENTORY_SLOT_PACKET; /** @var int */ public $windowId; diff --git a/src/pocketmine/network/mcpe/protocol/InventoryTransactionPacket.php b/src/pocketmine/network/mcpe/protocol/InventoryTransactionPacket.php index 2fa8832d3..c212c0376 100644 --- a/src/pocketmine/network/mcpe/protocol/InventoryTransactionPacket.php +++ b/src/pocketmine/network/mcpe/protocol/InventoryTransactionPacket.php @@ -29,23 +29,23 @@ use pocketmine\network\mcpe\NetworkSession; use pocketmine\network\mcpe\protocol\types\NetworkInventoryAction; class InventoryTransactionPacket extends DataPacket{ - const NETWORK_ID = ProtocolInfo::INVENTORY_TRANSACTION_PACKET; + public const NETWORK_ID = ProtocolInfo::INVENTORY_TRANSACTION_PACKET; - const TYPE_NORMAL = 0; - const TYPE_MISMATCH = 1; - const TYPE_USE_ITEM = 2; - const TYPE_USE_ITEM_ON_ENTITY = 3; - const TYPE_RELEASE_ITEM = 4; + public const TYPE_NORMAL = 0; + public const TYPE_MISMATCH = 1; + public const TYPE_USE_ITEM = 2; + public const TYPE_USE_ITEM_ON_ENTITY = 3; + public const TYPE_RELEASE_ITEM = 4; - const USE_ITEM_ACTION_CLICK_BLOCK = 0; - const USE_ITEM_ACTION_CLICK_AIR = 1; - const USE_ITEM_ACTION_BREAK_BLOCK = 2; + public const USE_ITEM_ACTION_CLICK_BLOCK = 0; + public const USE_ITEM_ACTION_CLICK_AIR = 1; + public const USE_ITEM_ACTION_BREAK_BLOCK = 2; - const RELEASE_ITEM_ACTION_RELEASE = 0; //bow shoot - const RELEASE_ITEM_ACTION_CONSUME = 1; //eat food, drink potion + public const RELEASE_ITEM_ACTION_RELEASE = 0; //bow shoot + public const RELEASE_ITEM_ACTION_CONSUME = 1; //eat food, drink potion - const USE_ITEM_ON_ENTITY_ACTION_INTERACT = 0; - const USE_ITEM_ON_ENTITY_ACTION_ATTACK = 1; + public const USE_ITEM_ON_ENTITY_ACTION_INTERACT = 0; + public const USE_ITEM_ON_ENTITY_ACTION_ATTACK = 1; /** @var int */ public $transactionType; diff --git a/src/pocketmine/network/mcpe/protocol/ItemFrameDropItemPacket.php b/src/pocketmine/network/mcpe/protocol/ItemFrameDropItemPacket.php index 65b3d7641..9e8a7a283 100644 --- a/src/pocketmine/network/mcpe/protocol/ItemFrameDropItemPacket.php +++ b/src/pocketmine/network/mcpe/protocol/ItemFrameDropItemPacket.php @@ -29,7 +29,7 @@ use pocketmine\network\mcpe\NetworkSession; class ItemFrameDropItemPacket extends DataPacket{ - const NETWORK_ID = ProtocolInfo::ITEM_FRAME_DROP_ITEM_PACKET; + public const NETWORK_ID = ProtocolInfo::ITEM_FRAME_DROP_ITEM_PACKET; /** @var int */ public $x; diff --git a/src/pocketmine/network/mcpe/protocol/LevelEventPacket.php b/src/pocketmine/network/mcpe/protocol/LevelEventPacket.php index 65ff28679..2f82d0114 100644 --- a/src/pocketmine/network/mcpe/protocol/LevelEventPacket.php +++ b/src/pocketmine/network/mcpe/protocol/LevelEventPacket.php @@ -29,85 +29,85 @@ use pocketmine\math\Vector3; use pocketmine\network\mcpe\NetworkSession; class LevelEventPacket extends DataPacket{ - const NETWORK_ID = ProtocolInfo::LEVEL_EVENT_PACKET; + public const NETWORK_ID = ProtocolInfo::LEVEL_EVENT_PACKET; - const EVENT_SOUND_CLICK = 1000; - const EVENT_SOUND_CLICK_FAIL = 1001; - const EVENT_SOUND_SHOOT = 1002; - const EVENT_SOUND_DOOR = 1003; - const EVENT_SOUND_FIZZ = 1004; - const EVENT_SOUND_IGNITE = 1005; + public const EVENT_SOUND_CLICK = 1000; + public const EVENT_SOUND_CLICK_FAIL = 1001; + public const EVENT_SOUND_SHOOT = 1002; + public const EVENT_SOUND_DOOR = 1003; + public const EVENT_SOUND_FIZZ = 1004; + public const EVENT_SOUND_IGNITE = 1005; - const EVENT_SOUND_GHAST = 1007; - const EVENT_SOUND_GHAST_SHOOT = 1008; - const EVENT_SOUND_BLAZE_SHOOT = 1009; - const EVENT_SOUND_DOOR_BUMP = 1010; + public const EVENT_SOUND_GHAST = 1007; + public const EVENT_SOUND_GHAST_SHOOT = 1008; + public const EVENT_SOUND_BLAZE_SHOOT = 1009; + public const EVENT_SOUND_DOOR_BUMP = 1010; - const EVENT_SOUND_DOOR_CRASH = 1012; + public const EVENT_SOUND_DOOR_CRASH = 1012; - const EVENT_SOUND_ENDERMAN_TELEPORT = 1018; + public const EVENT_SOUND_ENDERMAN_TELEPORT = 1018; - const EVENT_SOUND_ANVIL_BREAK = 1020; - const EVENT_SOUND_ANVIL_USE = 1021; - const EVENT_SOUND_ANVIL_FALL = 1022; + public const EVENT_SOUND_ANVIL_BREAK = 1020; + public const EVENT_SOUND_ANVIL_USE = 1021; + public const EVENT_SOUND_ANVIL_FALL = 1022; - const EVENT_SOUND_POP = 1030; + public const EVENT_SOUND_POP = 1030; - const EVENT_SOUND_PORTAL = 1032; + public const EVENT_SOUND_PORTAL = 1032; - const EVENT_SOUND_ITEMFRAME_ADD_ITEM = 1040; - const EVENT_SOUND_ITEMFRAME_REMOVE = 1041; - const EVENT_SOUND_ITEMFRAME_PLACE = 1042; - const EVENT_SOUND_ITEMFRAME_REMOVE_ITEM = 1043; - const EVENT_SOUND_ITEMFRAME_ROTATE_ITEM = 1044; + public const EVENT_SOUND_ITEMFRAME_ADD_ITEM = 1040; + public const EVENT_SOUND_ITEMFRAME_REMOVE = 1041; + public const EVENT_SOUND_ITEMFRAME_PLACE = 1042; + public const EVENT_SOUND_ITEMFRAME_REMOVE_ITEM = 1043; + public const EVENT_SOUND_ITEMFRAME_ROTATE_ITEM = 1044; - const EVENT_SOUND_CAMERA = 1050; - const EVENT_SOUND_ORB = 1051; - const EVENT_SOUND_TOTEM = 1052; + public const EVENT_SOUND_CAMERA = 1050; + public const EVENT_SOUND_ORB = 1051; + public const EVENT_SOUND_TOTEM = 1052; - const EVENT_SOUND_ARMOR_STAND_BREAK = 1060; - const EVENT_SOUND_ARMOR_STAND_HIT = 1061; - const EVENT_SOUND_ARMOR_STAND_FALL = 1062; - const EVENT_SOUND_ARMOR_STAND_PLACE = 1063; + public const EVENT_SOUND_ARMOR_STAND_BREAK = 1060; + public const EVENT_SOUND_ARMOR_STAND_HIT = 1061; + public const EVENT_SOUND_ARMOR_STAND_FALL = 1062; + public const EVENT_SOUND_ARMOR_STAND_PLACE = 1063; //TODO: check 2000-2017 - const EVENT_PARTICLE_SHOOT = 2000; - const EVENT_PARTICLE_DESTROY = 2001; - const EVENT_PARTICLE_SPLASH = 2002; - const EVENT_PARTICLE_EYE_DESPAWN = 2003; - const EVENT_PARTICLE_SPAWN = 2004; + public const EVENT_PARTICLE_SHOOT = 2000; + public const EVENT_PARTICLE_DESTROY = 2001; + public const EVENT_PARTICLE_SPLASH = 2002; + public const EVENT_PARTICLE_EYE_DESPAWN = 2003; + public const EVENT_PARTICLE_SPAWN = 2004; - const EVENT_GUARDIAN_CURSE = 2006; + public const EVENT_GUARDIAN_CURSE = 2006; - const EVENT_PARTICLE_BLOCK_FORCE_FIELD = 2008; + public const EVENT_PARTICLE_BLOCK_FORCE_FIELD = 2008; - const EVENT_PARTICLE_PUNCH_BLOCK = 2014; + public const EVENT_PARTICLE_PUNCH_BLOCK = 2014; - const EVENT_START_RAIN = 3001; - const EVENT_START_THUNDER = 3002; - const EVENT_STOP_RAIN = 3003; - const EVENT_STOP_THUNDER = 3004; - const EVENT_PAUSE_GAME = 3005; //data: 1 to pause, 0 to resume + public const EVENT_START_RAIN = 3001; + public const EVENT_START_THUNDER = 3002; + public const EVENT_STOP_RAIN = 3003; + public const EVENT_STOP_THUNDER = 3004; + public const EVENT_PAUSE_GAME = 3005; //data: 1 to pause, 0 to resume - const EVENT_REDSTONE_TRIGGER = 3500; - const EVENT_CAULDRON_EXPLODE = 3501; - const EVENT_CAULDRON_DYE_ARMOR = 3502; - const EVENT_CAULDRON_CLEAN_ARMOR = 3503; - const EVENT_CAULDRON_FILL_POTION = 3504; - const EVENT_CAULDRON_TAKE_POTION = 3505; - const EVENT_CAULDRON_FILL_WATER = 3506; - const EVENT_CAULDRON_TAKE_WATER = 3507; - const EVENT_CAULDRON_ADD_DYE = 3508; - const EVENT_CAULDRON_CLEAN_BANNER = 3509; + public const EVENT_REDSTONE_TRIGGER = 3500; + public const EVENT_CAULDRON_EXPLODE = 3501; + public const EVENT_CAULDRON_DYE_ARMOR = 3502; + public const EVENT_CAULDRON_CLEAN_ARMOR = 3503; + public const EVENT_CAULDRON_FILL_POTION = 3504; + public const EVENT_CAULDRON_TAKE_POTION = 3505; + public const EVENT_CAULDRON_FILL_WATER = 3506; + public const EVENT_CAULDRON_TAKE_WATER = 3507; + public const EVENT_CAULDRON_ADD_DYE = 3508; + public const EVENT_CAULDRON_CLEAN_BANNER = 3509; - const EVENT_BLOCK_START_BREAK = 3600; - const EVENT_BLOCK_STOP_BREAK = 3601; + public const EVENT_BLOCK_START_BREAK = 3600; + public const EVENT_BLOCK_STOP_BREAK = 3601; - const EVENT_SET_DATA = 4000; + public const EVENT_SET_DATA = 4000; - const EVENT_PLAYERS_SLEEPING = 9800; + public const EVENT_PLAYERS_SLEEPING = 9800; - const EVENT_ADD_PARTICLE_MASK = 0x4000; + public const EVENT_ADD_PARTICLE_MASK = 0x4000; /** @var int */ public $evid; diff --git a/src/pocketmine/network/mcpe/protocol/LevelSoundEventPacket.php b/src/pocketmine/network/mcpe/protocol/LevelSoundEventPacket.php index d5a702ba1..2ba63a9a3 100644 --- a/src/pocketmine/network/mcpe/protocol/LevelSoundEventPacket.php +++ b/src/pocketmine/network/mcpe/protocol/LevelSoundEventPacket.php @@ -29,169 +29,169 @@ use pocketmine\math\Vector3; use pocketmine\network\mcpe\NetworkSession; class LevelSoundEventPacket extends DataPacket{ - const NETWORK_ID = ProtocolInfo::LEVEL_SOUND_EVENT_PACKET; + public const NETWORK_ID = ProtocolInfo::LEVEL_SOUND_EVENT_PACKET; - const SOUND_ITEM_USE_ON = 0; - const SOUND_HIT = 1; - const SOUND_STEP = 2; - const SOUND_FLY = 3; - const SOUND_JUMP = 4; - const SOUND_BREAK = 5; - const SOUND_PLACE = 6; - const SOUND_HEAVY_STEP = 7; - const SOUND_GALLOP = 8; - const SOUND_FALL = 9; - const SOUND_AMBIENT = 10; - const SOUND_AMBIENT_BABY = 11; - const SOUND_AMBIENT_IN_WATER = 12; - const SOUND_BREATHE = 13; - const SOUND_DEATH = 14; - const SOUND_DEATH_IN_WATER = 15; - const SOUND_DEATH_TO_ZOMBIE = 16; - const SOUND_HURT = 17; - const SOUND_HURT_IN_WATER = 18; - const SOUND_MAD = 19; - const SOUND_BOOST = 20; - const SOUND_BOW = 21; - const SOUND_SQUISH_BIG = 22; - const SOUND_SQUISH_SMALL = 23; - const SOUND_FALL_BIG = 24; - const SOUND_FALL_SMALL = 25; - const SOUND_SPLASH = 26; - const SOUND_FIZZ = 27; - const SOUND_FLAP = 28; - const SOUND_SWIM = 29; - const SOUND_DRINK = 30; - const SOUND_EAT = 31; - const SOUND_TAKEOFF = 32; - const SOUND_SHAKE = 33; - const SOUND_PLOP = 34; - const SOUND_LAND = 35; - const SOUND_SADDLE = 36; - const SOUND_ARMOR = 37; - const SOUND_ADD_CHEST = 38; - const SOUND_THROW = 39; - const SOUND_ATTACK = 40; - const SOUND_ATTACK_NODAMAGE = 41; - const SOUND_WARN = 42; - const SOUND_SHEAR = 43; - const SOUND_MILK = 44; - const SOUND_THUNDER = 45; - const SOUND_EXPLODE = 46; - const SOUND_FIRE = 47; - const SOUND_IGNITE = 48; - const SOUND_FUSE = 49; - const SOUND_STARE = 50; - const SOUND_SPAWN = 51; - const SOUND_SHOOT = 52; - const SOUND_BREAK_BLOCK = 53; - const SOUND_LAUNCH = 54; - const SOUND_BLAST = 55; - const SOUND_LARGE_BLAST = 56; - const SOUND_TWINKLE = 57; - const SOUND_REMEDY = 58; - const SOUND_UNFECT = 59; - const SOUND_LEVELUP = 60; - const SOUND_BOW_HIT = 61; - const SOUND_BULLET_HIT = 62; - const SOUND_EXTINGUISH_FIRE = 63; - const SOUND_ITEM_FIZZ = 64; - const SOUND_CHEST_OPEN = 65; - const SOUND_CHEST_CLOSED = 66; - const SOUND_SHULKERBOX_OPEN = 67; - const SOUND_SHULKERBOX_CLOSED = 68; - const SOUND_POWER_ON = 69; - const SOUND_POWER_OFF = 70; - const SOUND_ATTACH = 71; - const SOUND_DETACH = 72; - const SOUND_DENY = 73; - const SOUND_TRIPOD = 74; - const SOUND_POP = 75; - const SOUND_DROP_SLOT = 76; - const SOUND_NOTE = 77; - const SOUND_THORNS = 78; - const SOUND_PISTON_IN = 79; - const SOUND_PISTON_OUT = 80; - const SOUND_PORTAL = 81; - const SOUND_WATER = 82; - const SOUND_LAVA_POP = 83; - const SOUND_LAVA = 84; - const SOUND_BURP = 85; - const SOUND_BUCKET_FILL_WATER = 86; - const SOUND_BUCKET_FILL_LAVA = 87; - const SOUND_BUCKET_EMPTY_WATER = 88; - const SOUND_BUCKET_EMPTY_LAVA = 89; - const SOUND_RECORD_13 = 90; - const SOUND_RECORD_CAT = 91; - const SOUND_RECORD_BLOCKS = 92; - const SOUND_RECORD_CHIRP = 93; - const SOUND_RECORD_FAR = 94; - const SOUND_RECORD_MALL = 95; - const SOUND_RECORD_MELLOHI = 96; - const SOUND_RECORD_STAL = 97; - const SOUND_RECORD_STRAD = 98; - const SOUND_RECORD_WARD = 99; - const SOUND_RECORD_11 = 100; - const SOUND_RECORD_WAIT = 101; - const SOUND_GUARDIAN_FLOP = 103; - const SOUND_ELDERGUARDIAN_CURSE = 104; - const SOUND_MOB_WARNING = 105; - const SOUND_MOB_WARNING_BABY = 106; - const SOUND_TELEPORT = 107; - const SOUND_SHULKER_OPEN = 108; - const SOUND_SHULKER_CLOSE = 109; - const SOUND_HAGGLE = 110; - const SOUND_HAGGLE_YES = 111; - const SOUND_HAGGLE_NO = 112; - const SOUND_HAGGLE_IDLE = 113; - const SOUND_CHORUSGROW = 114; - const SOUND_CHORUSDEATH = 115; - const SOUND_GLASS = 116; - const SOUND_CAST_SPELL = 117; - const SOUND_PREPARE_ATTACK = 118; - const SOUND_PREPARE_SUMMON = 119; - const SOUND_PREPARE_WOLOLO = 120; - const SOUND_FANG = 121; - const SOUND_CHARGE = 122; - const SOUND_CAMERA_TAKE_PICTURE = 123; - const SOUND_LEASHKNOT_PLACE = 124; - const SOUND_LEASHKNOT_BREAK = 125; - const SOUND_GROWL = 126; - const SOUND_WHINE = 127; - const SOUND_PANT = 128; - const SOUND_PURR = 129; - const SOUND_PURREOW = 130; - const SOUND_DEATH_MIN_VOLUME = 131; - const SOUND_DEATH_MID_VOLUME = 132; - const SOUND_IMITATE_BLAZE = 133; - const SOUND_IMITATE_CAVE_SPIDER = 134; - const SOUND_IMITATE_CREEPER = 135; - const SOUND_IMITATE_ELDER_GUARDIAN = 136; - const SOUND_IMITATE_ENDER_DRAGON = 137; - const SOUND_IMITATE_ENDERMAN = 138; - const SOUND_IMITATE_EVOCATION_ILLAGER = 140; - const SOUND_IMITATE_GHAST = 141; - const SOUND_IMITATE_HUSK = 142; - const SOUND_IMITATE_ILLUSION_ILLAGER = 143; - const SOUND_IMITATE_MAGMA_CUBE = 144; - const SOUND_IMITATE_POLAR_BEAR = 145; - const SOUND_IMITATE_SHULKER = 146; - const SOUND_IMITATE_SILVERFISH = 147; - const SOUND_IMITATE_SKELETON = 148; - const SOUND_IMITATE_SLIME = 149; - const SOUND_IMITATE_SPIDER = 150; - const SOUND_IMITATE_STRAY = 151; - const SOUND_IMITATE_VEX = 152; - const SOUND_IMITATE_VINDICATION_ILLAGER = 153; - const SOUND_IMITATE_WITCH = 154; - const SOUND_IMITATE_WITHER = 155; - const SOUND_IMITATE_WITHER_SKELETON = 156; - const SOUND_IMITATE_WOLF = 157; - const SOUND_IMITATE_ZOMBIE = 158; - const SOUND_IMITATE_ZOMBIE_PIGMAN = 159; - const SOUND_IMITATE_ZOMBIE_VILLAGER = 160; - const SOUND_DEFAULT = 161; - const SOUND_UNDEFINED = 162; + public const SOUND_ITEM_USE_ON = 0; + public const SOUND_HIT = 1; + public const SOUND_STEP = 2; + public const SOUND_FLY = 3; + public const SOUND_JUMP = 4; + public const SOUND_BREAK = 5; + public const SOUND_PLACE = 6; + public const SOUND_HEAVY_STEP = 7; + public const SOUND_GALLOP = 8; + public const SOUND_FALL = 9; + public const SOUND_AMBIENT = 10; + public const SOUND_AMBIENT_BABY = 11; + public const SOUND_AMBIENT_IN_WATER = 12; + public const SOUND_BREATHE = 13; + public const SOUND_DEATH = 14; + public const SOUND_DEATH_IN_WATER = 15; + public const SOUND_DEATH_TO_ZOMBIE = 16; + public const SOUND_HURT = 17; + public const SOUND_HURT_IN_WATER = 18; + public const SOUND_MAD = 19; + public const SOUND_BOOST = 20; + public const SOUND_BOW = 21; + public const SOUND_SQUISH_BIG = 22; + public const SOUND_SQUISH_SMALL = 23; + public const SOUND_FALL_BIG = 24; + public const SOUND_FALL_SMALL = 25; + public const SOUND_SPLASH = 26; + public const SOUND_FIZZ = 27; + public const SOUND_FLAP = 28; + public const SOUND_SWIM = 29; + public const SOUND_DRINK = 30; + public const SOUND_EAT = 31; + public const SOUND_TAKEOFF = 32; + public const SOUND_SHAKE = 33; + public const SOUND_PLOP = 34; + public const SOUND_LAND = 35; + public const SOUND_SADDLE = 36; + public const SOUND_ARMOR = 37; + public const SOUND_ADD_CHEST = 38; + public const SOUND_THROW = 39; + public const SOUND_ATTACK = 40; + public const SOUND_ATTACK_NODAMAGE = 41; + public const SOUND_WARN = 42; + public const SOUND_SHEAR = 43; + public const SOUND_MILK = 44; + public const SOUND_THUNDER = 45; + public const SOUND_EXPLODE = 46; + public const SOUND_FIRE = 47; + public const SOUND_IGNITE = 48; + public const SOUND_FUSE = 49; + public const SOUND_STARE = 50; + public const SOUND_SPAWN = 51; + public const SOUND_SHOOT = 52; + public const SOUND_BREAK_BLOCK = 53; + public const SOUND_LAUNCH = 54; + public const SOUND_BLAST = 55; + public const SOUND_LARGE_BLAST = 56; + public const SOUND_TWINKLE = 57; + public const SOUND_REMEDY = 58; + public const SOUND_UNFECT = 59; + public const SOUND_LEVELUP = 60; + public const SOUND_BOW_HIT = 61; + public const SOUND_BULLET_HIT = 62; + public const SOUND_EXTINGUISH_FIRE = 63; + public const SOUND_ITEM_FIZZ = 64; + public const SOUND_CHEST_OPEN = 65; + public const SOUND_CHEST_CLOSED = 66; + public const SOUND_SHULKERBOX_OPEN = 67; + public const SOUND_SHULKERBOX_CLOSED = 68; + public const SOUND_POWER_ON = 69; + public const SOUND_POWER_OFF = 70; + public const SOUND_ATTACH = 71; + public const SOUND_DETACH = 72; + public const SOUND_DENY = 73; + public const SOUND_TRIPOD = 74; + public const SOUND_POP = 75; + public const SOUND_DROP_SLOT = 76; + public const SOUND_NOTE = 77; + public const SOUND_THORNS = 78; + public const SOUND_PISTON_IN = 79; + public const SOUND_PISTON_OUT = 80; + public const SOUND_PORTAL = 81; + public const SOUND_WATER = 82; + public const SOUND_LAVA_POP = 83; + public const SOUND_LAVA = 84; + public const SOUND_BURP = 85; + public const SOUND_BUCKET_FILL_WATER = 86; + public const SOUND_BUCKET_FILL_LAVA = 87; + public const SOUND_BUCKET_EMPTY_WATER = 88; + public const SOUND_BUCKET_EMPTY_LAVA = 89; + public const SOUND_RECORD_13 = 90; + public const SOUND_RECORD_CAT = 91; + public const SOUND_RECORD_BLOCKS = 92; + public const SOUND_RECORD_CHIRP = 93; + public const SOUND_RECORD_FAR = 94; + public const SOUND_RECORD_MALL = 95; + public const SOUND_RECORD_MELLOHI = 96; + public const SOUND_RECORD_STAL = 97; + public const SOUND_RECORD_STRAD = 98; + public const SOUND_RECORD_WARD = 99; + public const SOUND_RECORD_11 = 100; + public const SOUND_RECORD_WAIT = 101; + public const SOUND_GUARDIAN_FLOP = 103; + public const SOUND_ELDERGUARDIAN_CURSE = 104; + public const SOUND_MOB_WARNING = 105; + public const SOUND_MOB_WARNING_BABY = 106; + public const SOUND_TELEPORT = 107; + public const SOUND_SHULKER_OPEN = 108; + public const SOUND_SHULKER_CLOSE = 109; + public const SOUND_HAGGLE = 110; + public const SOUND_HAGGLE_YES = 111; + public const SOUND_HAGGLE_NO = 112; + public const SOUND_HAGGLE_IDLE = 113; + public const SOUND_CHORUSGROW = 114; + public const SOUND_CHORUSDEATH = 115; + public const SOUND_GLASS = 116; + public const SOUND_CAST_SPELL = 117; + public const SOUND_PREPARE_ATTACK = 118; + public const SOUND_PREPARE_SUMMON = 119; + public const SOUND_PREPARE_WOLOLO = 120; + public const SOUND_FANG = 121; + public const SOUND_CHARGE = 122; + public const SOUND_CAMERA_TAKE_PICTURE = 123; + public const SOUND_LEASHKNOT_PLACE = 124; + public const SOUND_LEASHKNOT_BREAK = 125; + public const SOUND_GROWL = 126; + public const SOUND_WHINE = 127; + public const SOUND_PANT = 128; + public const SOUND_PURR = 129; + public const SOUND_PURREOW = 130; + public const SOUND_DEATH_MIN_VOLUME = 131; + public const SOUND_DEATH_MID_VOLUME = 132; + public const SOUND_IMITATE_BLAZE = 133; + public const SOUND_IMITATE_CAVE_SPIDER = 134; + public const SOUND_IMITATE_CREEPER = 135; + public const SOUND_IMITATE_ELDER_GUARDIAN = 136; + public const SOUND_IMITATE_ENDER_DRAGON = 137; + public const SOUND_IMITATE_ENDERMAN = 138; + public const SOUND_IMITATE_EVOCATION_ILLAGER = 140; + public const SOUND_IMITATE_GHAST = 141; + public const SOUND_IMITATE_HUSK = 142; + public const SOUND_IMITATE_ILLUSION_ILLAGER = 143; + public const SOUND_IMITATE_MAGMA_CUBE = 144; + public const SOUND_IMITATE_POLAR_BEAR = 145; + public const SOUND_IMITATE_SHULKER = 146; + public const SOUND_IMITATE_SILVERFISH = 147; + public const SOUND_IMITATE_SKELETON = 148; + public const SOUND_IMITATE_SLIME = 149; + public const SOUND_IMITATE_SPIDER = 150; + public const SOUND_IMITATE_STRAY = 151; + public const SOUND_IMITATE_VEX = 152; + public const SOUND_IMITATE_VINDICATION_ILLAGER = 153; + public const SOUND_IMITATE_WITCH = 154; + public const SOUND_IMITATE_WITHER = 155; + public const SOUND_IMITATE_WITHER_SKELETON = 156; + public const SOUND_IMITATE_WOLF = 157; + public const SOUND_IMITATE_ZOMBIE = 158; + public const SOUND_IMITATE_ZOMBIE_PIGMAN = 159; + public const SOUND_IMITATE_ZOMBIE_VILLAGER = 160; + public const SOUND_DEFAULT = 161; + public const SOUND_UNDEFINED = 162; /** @var int */ public $sound; diff --git a/src/pocketmine/network/mcpe/protocol/LoginPacket.php b/src/pocketmine/network/mcpe/protocol/LoginPacket.php index 4ceb0e2cb..1140149c2 100644 --- a/src/pocketmine/network/mcpe/protocol/LoginPacket.php +++ b/src/pocketmine/network/mcpe/protocol/LoginPacket.php @@ -32,9 +32,9 @@ use pocketmine\utils\MainLogger; use pocketmine\utils\Utils; class LoginPacket extends DataPacket{ - const NETWORK_ID = ProtocolInfo::LOGIN_PACKET; + public const NETWORK_ID = ProtocolInfo::LOGIN_PACKET; - const EDITION_POCKET = 0; + public const EDITION_POCKET = 0; /** @var string */ public $username; diff --git a/src/pocketmine/network/mcpe/protocol/MapInfoRequestPacket.php b/src/pocketmine/network/mcpe/protocol/MapInfoRequestPacket.php index 78c14141d..d40feba24 100644 --- a/src/pocketmine/network/mcpe/protocol/MapInfoRequestPacket.php +++ b/src/pocketmine/network/mcpe/protocol/MapInfoRequestPacket.php @@ -30,7 +30,7 @@ namespace pocketmine\network\mcpe\protocol; use pocketmine\network\mcpe\NetworkSession; class MapInfoRequestPacket extends DataPacket{ - const NETWORK_ID = ProtocolInfo::MAP_INFO_REQUEST_PACKET; + public const NETWORK_ID = ProtocolInfo::MAP_INFO_REQUEST_PACKET; /** @var int */ public $mapId; diff --git a/src/pocketmine/network/mcpe/protocol/MobArmorEquipmentPacket.php b/src/pocketmine/network/mcpe/protocol/MobArmorEquipmentPacket.php index 16e4569b0..8ea55f16a 100644 --- a/src/pocketmine/network/mcpe/protocol/MobArmorEquipmentPacket.php +++ b/src/pocketmine/network/mcpe/protocol/MobArmorEquipmentPacket.php @@ -30,7 +30,7 @@ use pocketmine\item\Item; use pocketmine\network\mcpe\NetworkSession; class MobArmorEquipmentPacket extends DataPacket{ - const NETWORK_ID = ProtocolInfo::MOB_ARMOR_EQUIPMENT_PACKET; + public const NETWORK_ID = ProtocolInfo::MOB_ARMOR_EQUIPMENT_PACKET; /** @var int */ public $entityRuntimeId; diff --git a/src/pocketmine/network/mcpe/protocol/MobEffectPacket.php b/src/pocketmine/network/mcpe/protocol/MobEffectPacket.php index d2d3efe41..ab0c84a70 100644 --- a/src/pocketmine/network/mcpe/protocol/MobEffectPacket.php +++ b/src/pocketmine/network/mcpe/protocol/MobEffectPacket.php @@ -29,11 +29,11 @@ namespace pocketmine\network\mcpe\protocol; use pocketmine\network\mcpe\NetworkSession; class MobEffectPacket extends DataPacket{ - const NETWORK_ID = ProtocolInfo::MOB_EFFECT_PACKET; + public const NETWORK_ID = ProtocolInfo::MOB_EFFECT_PACKET; - const EVENT_ADD = 1; - const EVENT_MODIFY = 2; - const EVENT_REMOVE = 3; + public const EVENT_ADD = 1; + public const EVENT_MODIFY = 2; + public const EVENT_REMOVE = 3; /** @var int */ public $entityRuntimeId; diff --git a/src/pocketmine/network/mcpe/protocol/MobEquipmentPacket.php b/src/pocketmine/network/mcpe/protocol/MobEquipmentPacket.php index 6f8b7211a..f41cf7913 100644 --- a/src/pocketmine/network/mcpe/protocol/MobEquipmentPacket.php +++ b/src/pocketmine/network/mcpe/protocol/MobEquipmentPacket.php @@ -30,7 +30,7 @@ use pocketmine\item\Item; use pocketmine\network\mcpe\NetworkSession; class MobEquipmentPacket extends DataPacket{ - const NETWORK_ID = ProtocolInfo::MOB_EQUIPMENT_PACKET; + public const NETWORK_ID = ProtocolInfo::MOB_EQUIPMENT_PACKET; /** @var int */ public $entityRuntimeId; diff --git a/src/pocketmine/network/mcpe/protocol/ModalFormRequestPacket.php b/src/pocketmine/network/mcpe/protocol/ModalFormRequestPacket.php index 03663f967..a06c449a5 100644 --- a/src/pocketmine/network/mcpe/protocol/ModalFormRequestPacket.php +++ b/src/pocketmine/network/mcpe/protocol/ModalFormRequestPacket.php @@ -28,7 +28,7 @@ namespace pocketmine\network\mcpe\protocol; use pocketmine\network\mcpe\NetworkSession; class ModalFormRequestPacket extends DataPacket{ - const NETWORK_ID = ProtocolInfo::MODAL_FORM_REQUEST_PACKET; + public const NETWORK_ID = ProtocolInfo::MODAL_FORM_REQUEST_PACKET; /** @var int */ public $formId; diff --git a/src/pocketmine/network/mcpe/protocol/ModalFormResponsePacket.php b/src/pocketmine/network/mcpe/protocol/ModalFormResponsePacket.php index b4b1694eb..b8bfb7ced 100644 --- a/src/pocketmine/network/mcpe/protocol/ModalFormResponsePacket.php +++ b/src/pocketmine/network/mcpe/protocol/ModalFormResponsePacket.php @@ -28,7 +28,7 @@ namespace pocketmine\network\mcpe\protocol; use pocketmine\network\mcpe\NetworkSession; class ModalFormResponsePacket extends DataPacket{ - const NETWORK_ID = ProtocolInfo::MODAL_FORM_RESPONSE_PACKET; + public const NETWORK_ID = ProtocolInfo::MODAL_FORM_RESPONSE_PACKET; /** @var int */ public $formId; diff --git a/src/pocketmine/network/mcpe/protocol/MoveEntityPacket.php b/src/pocketmine/network/mcpe/protocol/MoveEntityPacket.php index 699089f73..6e0093cc1 100644 --- a/src/pocketmine/network/mcpe/protocol/MoveEntityPacket.php +++ b/src/pocketmine/network/mcpe/protocol/MoveEntityPacket.php @@ -30,7 +30,7 @@ use pocketmine\math\Vector3; use pocketmine\network\mcpe\NetworkSession; class MoveEntityPacket extends DataPacket{ - const NETWORK_ID = ProtocolInfo::MOVE_ENTITY_PACKET; + public const NETWORK_ID = ProtocolInfo::MOVE_ENTITY_PACKET; /** @var int */ public $entityRuntimeId; diff --git a/src/pocketmine/network/mcpe/protocol/MovePlayerPacket.php b/src/pocketmine/network/mcpe/protocol/MovePlayerPacket.php index 117463bf9..552a090e0 100644 --- a/src/pocketmine/network/mcpe/protocol/MovePlayerPacket.php +++ b/src/pocketmine/network/mcpe/protocol/MovePlayerPacket.php @@ -30,12 +30,12 @@ use pocketmine\math\Vector3; use pocketmine\network\mcpe\NetworkSession; class MovePlayerPacket extends DataPacket{ - const NETWORK_ID = ProtocolInfo::MOVE_PLAYER_PACKET; + public const NETWORK_ID = ProtocolInfo::MOVE_PLAYER_PACKET; - const MODE_NORMAL = 0; - const MODE_RESET = 1; - const MODE_TELEPORT = 2; - const MODE_PITCH = 3; //facepalm Mojang + public const MODE_NORMAL = 0; + public const MODE_RESET = 1; + public const MODE_TELEPORT = 2; + public const MODE_PITCH = 3; //facepalm Mojang /** @var int */ public $entityRuntimeId; diff --git a/src/pocketmine/network/mcpe/protocol/NpcRequestPacket.php b/src/pocketmine/network/mcpe/protocol/NpcRequestPacket.php index c37c7b794..c495a7b84 100644 --- a/src/pocketmine/network/mcpe/protocol/NpcRequestPacket.php +++ b/src/pocketmine/network/mcpe/protocol/NpcRequestPacket.php @@ -28,7 +28,7 @@ namespace pocketmine\network\mcpe\protocol; use pocketmine\network\mcpe\NetworkSession; class NpcRequestPacket extends DataPacket{ - const NETWORK_ID = ProtocolInfo::NPC_REQUEST_PACKET; + public const NETWORK_ID = ProtocolInfo::NPC_REQUEST_PACKET; /** @var int */ public $entityRuntimeId; diff --git a/src/pocketmine/network/mcpe/protocol/PhotoTransferPacket.php b/src/pocketmine/network/mcpe/protocol/PhotoTransferPacket.php index 1ecb01c74..dbee373ce 100644 --- a/src/pocketmine/network/mcpe/protocol/PhotoTransferPacket.php +++ b/src/pocketmine/network/mcpe/protocol/PhotoTransferPacket.php @@ -28,7 +28,7 @@ namespace pocketmine\network\mcpe\protocol; use pocketmine\network\mcpe\NetworkSession; class PhotoTransferPacket extends DataPacket{ - const NETWORK_ID = ProtocolInfo::PHOTO_TRANSFER_PACKET; + public const NETWORK_ID = ProtocolInfo::PHOTO_TRANSFER_PACKET; /** @var string */ public $photoName; diff --git a/src/pocketmine/network/mcpe/protocol/PlaySoundPacket.php b/src/pocketmine/network/mcpe/protocol/PlaySoundPacket.php index 9ec1b5bf0..d2dc8d44a 100644 --- a/src/pocketmine/network/mcpe/protocol/PlaySoundPacket.php +++ b/src/pocketmine/network/mcpe/protocol/PlaySoundPacket.php @@ -30,7 +30,7 @@ namespace pocketmine\network\mcpe\protocol; use pocketmine\network\mcpe\NetworkSession; class PlaySoundPacket extends DataPacket{ - const NETWORK_ID = ProtocolInfo::PLAY_SOUND_PACKET; + public const NETWORK_ID = ProtocolInfo::PLAY_SOUND_PACKET; /** @var string */ public $soundName; diff --git a/src/pocketmine/network/mcpe/protocol/PlayStatusPacket.php b/src/pocketmine/network/mcpe/protocol/PlayStatusPacket.php index 225540b8c..99e67941b 100644 --- a/src/pocketmine/network/mcpe/protocol/PlayStatusPacket.php +++ b/src/pocketmine/network/mcpe/protocol/PlayStatusPacket.php @@ -29,15 +29,15 @@ namespace pocketmine\network\mcpe\protocol; use pocketmine\network\mcpe\NetworkSession; class PlayStatusPacket extends DataPacket{ - const NETWORK_ID = ProtocolInfo::PLAY_STATUS_PACKET; + public const NETWORK_ID = ProtocolInfo::PLAY_STATUS_PACKET; - const LOGIN_SUCCESS = 0; - const LOGIN_FAILED_CLIENT = 1; - const LOGIN_FAILED_SERVER = 2; - const PLAYER_SPAWN = 3; - const LOGIN_FAILED_INVALID_TENANT = 4; - const LOGIN_FAILED_VANILLA_EDU = 5; - const LOGIN_FAILED_EDU_VANILLA = 6; + public const LOGIN_SUCCESS = 0; + public const LOGIN_FAILED_CLIENT = 1; + public const LOGIN_FAILED_SERVER = 2; + public const PLAYER_SPAWN = 3; + public const LOGIN_FAILED_INVALID_TENANT = 4; + public const LOGIN_FAILED_VANILLA_EDU = 5; + public const LOGIN_FAILED_EDU_VANILLA = 6; /** @var int */ public $status; diff --git a/src/pocketmine/network/mcpe/protocol/PlayerActionPacket.php b/src/pocketmine/network/mcpe/protocol/PlayerActionPacket.php index 15c137de9..6968c69a3 100644 --- a/src/pocketmine/network/mcpe/protocol/PlayerActionPacket.php +++ b/src/pocketmine/network/mcpe/protocol/PlayerActionPacket.php @@ -29,29 +29,29 @@ namespace pocketmine\network\mcpe\protocol; use pocketmine\network\mcpe\NetworkSession; class PlayerActionPacket extends DataPacket{ - const NETWORK_ID = ProtocolInfo::PLAYER_ACTION_PACKET; + public const NETWORK_ID = ProtocolInfo::PLAYER_ACTION_PACKET; - const ACTION_START_BREAK = 0; - const ACTION_ABORT_BREAK = 1; - const ACTION_STOP_BREAK = 2; - const ACTION_GET_UPDATED_BLOCK = 3; - const ACTION_DROP_ITEM = 4; - const ACTION_START_SLEEPING = 5; - const ACTION_STOP_SLEEPING = 6; - const ACTION_RESPAWN = 7; - const ACTION_JUMP = 8; - const ACTION_START_SPRINT = 9; - const ACTION_STOP_SPRINT = 10; - const ACTION_START_SNEAK = 11; - const ACTION_STOP_SNEAK = 12; - const ACTION_DIMENSION_CHANGE_REQUEST = 13; //sent when dying in different dimension - const ACTION_DIMENSION_CHANGE_ACK = 14; //sent when spawning in a different dimension to tell the server we spawned - const ACTION_START_GLIDE = 15; - const ACTION_STOP_GLIDE = 16; - const ACTION_BUILD_DENIED = 17; - const ACTION_CONTINUE_BREAK = 18; + public const ACTION_START_BREAK = 0; + public const ACTION_ABORT_BREAK = 1; + public const ACTION_STOP_BREAK = 2; + public const ACTION_GET_UPDATED_BLOCK = 3; + public const ACTION_DROP_ITEM = 4; + public const ACTION_START_SLEEPING = 5; + public const ACTION_STOP_SLEEPING = 6; + public const ACTION_RESPAWN = 7; + public const ACTION_JUMP = 8; + public const ACTION_START_SPRINT = 9; + public const ACTION_STOP_SPRINT = 10; + public const ACTION_START_SNEAK = 11; + public const ACTION_STOP_SNEAK = 12; + public const ACTION_DIMENSION_CHANGE_REQUEST = 13; //sent when dying in different dimension + public const ACTION_DIMENSION_CHANGE_ACK = 14; //sent when spawning in a different dimension to tell the server we spawned + public const ACTION_START_GLIDE = 15; + public const ACTION_STOP_GLIDE = 16; + public const ACTION_BUILD_DENIED = 17; + public const ACTION_CONTINUE_BREAK = 18; - const ACTION_SET_ENCHANTMENT_SEED = 20; + public const ACTION_SET_ENCHANTMENT_SEED = 20; /** @var int */ public $entityRuntimeId; diff --git a/src/pocketmine/network/mcpe/protocol/PlayerHotbarPacket.php b/src/pocketmine/network/mcpe/protocol/PlayerHotbarPacket.php index a9f1caad7..09c9e23d1 100644 --- a/src/pocketmine/network/mcpe/protocol/PlayerHotbarPacket.php +++ b/src/pocketmine/network/mcpe/protocol/PlayerHotbarPacket.php @@ -32,7 +32,7 @@ use pocketmine\utils\Binary; #endif class PlayerHotbarPacket extends DataPacket{ - const NETWORK_ID = ProtocolInfo::PLAYER_HOTBAR_PACKET; + public const NETWORK_ID = ProtocolInfo::PLAYER_HOTBAR_PACKET; /** @var int */ public $selectedHotbarSlot; diff --git a/src/pocketmine/network/mcpe/protocol/PlayerInputPacket.php b/src/pocketmine/network/mcpe/protocol/PlayerInputPacket.php index a398d0c2d..b7877f485 100644 --- a/src/pocketmine/network/mcpe/protocol/PlayerInputPacket.php +++ b/src/pocketmine/network/mcpe/protocol/PlayerInputPacket.php @@ -29,7 +29,7 @@ namespace pocketmine\network\mcpe\protocol; use pocketmine\network\mcpe\NetworkSession; class PlayerInputPacket extends DataPacket{ - const NETWORK_ID = ProtocolInfo::PLAYER_INPUT_PACKET; + public const NETWORK_ID = ProtocolInfo::PLAYER_INPUT_PACKET; /** @var float */ public $motionX; diff --git a/src/pocketmine/network/mcpe/protocol/PlayerListPacket.php b/src/pocketmine/network/mcpe/protocol/PlayerListPacket.php index 18b95ce02..6e28dc02f 100644 --- a/src/pocketmine/network/mcpe/protocol/PlayerListPacket.php +++ b/src/pocketmine/network/mcpe/protocol/PlayerListPacket.php @@ -31,10 +31,10 @@ use pocketmine\network\mcpe\NetworkSession; use pocketmine\network\mcpe\protocol\types\PlayerListEntry; class PlayerListPacket extends DataPacket{ - const NETWORK_ID = ProtocolInfo::PLAYER_LIST_PACKET; + public const NETWORK_ID = ProtocolInfo::PLAYER_LIST_PACKET; - const TYPE_ADD = 0; - const TYPE_REMOVE = 1; + public const TYPE_ADD = 0; + public const TYPE_REMOVE = 1; /** @var PlayerListEntry[] */ public $entries = []; diff --git a/src/pocketmine/network/mcpe/protocol/PlayerSkinPacket.php b/src/pocketmine/network/mcpe/protocol/PlayerSkinPacket.php index 0ed5c6fde..2008c858f 100644 --- a/src/pocketmine/network/mcpe/protocol/PlayerSkinPacket.php +++ b/src/pocketmine/network/mcpe/protocol/PlayerSkinPacket.php @@ -30,7 +30,7 @@ use pocketmine\network\mcpe\NetworkSession; use pocketmine\utils\UUID; class PlayerSkinPacket extends DataPacket{ - const NETWORK_ID = ProtocolInfo::PLAYER_SKIN_PACKET; + public const NETWORK_ID = ProtocolInfo::PLAYER_SKIN_PACKET; /** @var UUID */ public $uuid; diff --git a/src/pocketmine/network/mcpe/protocol/ProtocolInfo.php b/src/pocketmine/network/mcpe/protocol/ProtocolInfo.php index fb50a4215..0a31da277 100644 --- a/src/pocketmine/network/mcpe/protocol/ProtocolInfo.php +++ b/src/pocketmine/network/mcpe/protocol/ProtocolInfo.php @@ -39,120 +39,120 @@ interface ProtocolInfo{ /** * Actual Minecraft: PE protocol version */ - const CURRENT_PROTOCOL = 137; + public const CURRENT_PROTOCOL = 137; /** * Current Minecraft PE version reported by the server. This is usually the earliest currently supported version. */ - const MINECRAFT_VERSION = 'v1.2.0.81'; + public const MINECRAFT_VERSION = 'v1.2.0.81'; /** * Version number sent to clients in ping responses. */ - const MINECRAFT_VERSION_NETWORK = '1.2.0.81'; + public const MINECRAFT_VERSION_NETWORK = '1.2.0.81'; - const LOGIN_PACKET = 0x01; - const PLAY_STATUS_PACKET = 0x02; - const SERVER_TO_CLIENT_HANDSHAKE_PACKET = 0x03; - const CLIENT_TO_SERVER_HANDSHAKE_PACKET = 0x04; - const DISCONNECT_PACKET = 0x05; - const RESOURCE_PACKS_INFO_PACKET = 0x06; - const RESOURCE_PACK_STACK_PACKET = 0x07; - const RESOURCE_PACK_CLIENT_RESPONSE_PACKET = 0x08; - const TEXT_PACKET = 0x09; - const SET_TIME_PACKET = 0x0a; - const START_GAME_PACKET = 0x0b; - const ADD_PLAYER_PACKET = 0x0c; - const ADD_ENTITY_PACKET = 0x0d; - const REMOVE_ENTITY_PACKET = 0x0e; - const ADD_ITEM_ENTITY_PACKET = 0x0f; - const ADD_HANGING_ENTITY_PACKET = 0x10; - const TAKE_ITEM_ENTITY_PACKET = 0x11; - const MOVE_ENTITY_PACKET = 0x12; - const MOVE_PLAYER_PACKET = 0x13; - const RIDER_JUMP_PACKET = 0x14; - const UPDATE_BLOCK_PACKET = 0x15; - const ADD_PAINTING_PACKET = 0x16; - const EXPLODE_PACKET = 0x17; - const LEVEL_SOUND_EVENT_PACKET = 0x18; - const LEVEL_EVENT_PACKET = 0x19; - const BLOCK_EVENT_PACKET = 0x1a; - const ENTITY_EVENT_PACKET = 0x1b; - const MOB_EFFECT_PACKET = 0x1c; - const UPDATE_ATTRIBUTES_PACKET = 0x1d; - const INVENTORY_TRANSACTION_PACKET = 0x1e; - const MOB_EQUIPMENT_PACKET = 0x1f; - const MOB_ARMOR_EQUIPMENT_PACKET = 0x20; - const INTERACT_PACKET = 0x21; - const BLOCK_PICK_REQUEST_PACKET = 0x22; - const ENTITY_PICK_REQUEST_PACKET = 0x23; - const PLAYER_ACTION_PACKET = 0x24; - const ENTITY_FALL_PACKET = 0x25; - const HURT_ARMOR_PACKET = 0x26; - const SET_ENTITY_DATA_PACKET = 0x27; - const SET_ENTITY_MOTION_PACKET = 0x28; - const SET_ENTITY_LINK_PACKET = 0x29; - const SET_HEALTH_PACKET = 0x2a; - const SET_SPAWN_POSITION_PACKET = 0x2b; - const ANIMATE_PACKET = 0x2c; - const RESPAWN_PACKET = 0x2d; - const CONTAINER_OPEN_PACKET = 0x2e; - const CONTAINER_CLOSE_PACKET = 0x2f; - const PLAYER_HOTBAR_PACKET = 0x30; - const INVENTORY_CONTENT_PACKET = 0x31; - const INVENTORY_SLOT_PACKET = 0x32; - const CONTAINER_SET_DATA_PACKET = 0x33; - const CRAFTING_DATA_PACKET = 0x34; - const CRAFTING_EVENT_PACKET = 0x35; - const GUI_DATA_PICK_ITEM_PACKET = 0x36; - const ADVENTURE_SETTINGS_PACKET = 0x37; - const BLOCK_ENTITY_DATA_PACKET = 0x38; - const PLAYER_INPUT_PACKET = 0x39; - const FULL_CHUNK_DATA_PACKET = 0x3a; - const SET_COMMANDS_ENABLED_PACKET = 0x3b; - const SET_DIFFICULTY_PACKET = 0x3c; - const CHANGE_DIMENSION_PACKET = 0x3d; - const SET_PLAYER_GAME_TYPE_PACKET = 0x3e; - const PLAYER_LIST_PACKET = 0x3f; - const SIMPLE_EVENT_PACKET = 0x40; - const EVENT_PACKET = 0x41; - const SPAWN_EXPERIENCE_ORB_PACKET = 0x42; - const CLIENTBOUND_MAP_ITEM_DATA_PACKET = 0x43; - const MAP_INFO_REQUEST_PACKET = 0x44; - const REQUEST_CHUNK_RADIUS_PACKET = 0x45; - const CHUNK_RADIUS_UPDATED_PACKET = 0x46; - const ITEM_FRAME_DROP_ITEM_PACKET = 0x47; - const GAME_RULES_CHANGED_PACKET = 0x48; - const CAMERA_PACKET = 0x49; - const BOSS_EVENT_PACKET = 0x4a; - const SHOW_CREDITS_PACKET = 0x4b; - const AVAILABLE_COMMANDS_PACKET = 0x4c; - const COMMAND_REQUEST_PACKET = 0x4d; - const COMMAND_BLOCK_UPDATE_PACKET = 0x4e; - const COMMAND_OUTPUT_PACKET = 0x4f; - const UPDATE_TRADE_PACKET = 0x50; - const UPDATE_EQUIP_PACKET = 0x51; - const RESOURCE_PACK_DATA_INFO_PACKET = 0x52; - const RESOURCE_PACK_CHUNK_DATA_PACKET = 0x53; - const RESOURCE_PACK_CHUNK_REQUEST_PACKET = 0x54; - const TRANSFER_PACKET = 0x55; - const PLAY_SOUND_PACKET = 0x56; - const STOP_SOUND_PACKET = 0x57; - const SET_TITLE_PACKET = 0x58; - const ADD_BEHAVIOR_TREE_PACKET = 0x59; - const STRUCTURE_BLOCK_UPDATE_PACKET = 0x5a; - const SHOW_STORE_OFFER_PACKET = 0x5b; - const PURCHASE_RECEIPT_PACKET = 0x5c; - const PLAYER_SKIN_PACKET = 0x5d; - const SUB_CLIENT_LOGIN_PACKET = 0x5e; - const W_S_CONNECT_PACKET = 0x5f; - const SET_LAST_HURT_BY_PACKET = 0x60; - const BOOK_EDIT_PACKET = 0x61; - const NPC_REQUEST_PACKET = 0x62; - const PHOTO_TRANSFER_PACKET = 0x63; - const MODAL_FORM_REQUEST_PACKET = 0x64; - const MODAL_FORM_RESPONSE_PACKET = 0x65; - const SERVER_SETTINGS_REQUEST_PACKET = 0x66; - const SERVER_SETTINGS_RESPONSE_PACKET = 0x67; - const SHOW_PROFILE_PACKET = 0x68; - const SET_DEFAULT_GAME_TYPE_PACKET = 0x69; + public const LOGIN_PACKET = 0x01; + public const PLAY_STATUS_PACKET = 0x02; + public const SERVER_TO_CLIENT_HANDSHAKE_PACKET = 0x03; + public const CLIENT_TO_SERVER_HANDSHAKE_PACKET = 0x04; + public const DISCONNECT_PACKET = 0x05; + public const RESOURCE_PACKS_INFO_PACKET = 0x06; + public const RESOURCE_PACK_STACK_PACKET = 0x07; + public const RESOURCE_PACK_CLIENT_RESPONSE_PACKET = 0x08; + public const TEXT_PACKET = 0x09; + public const SET_TIME_PACKET = 0x0a; + public const START_GAME_PACKET = 0x0b; + public const ADD_PLAYER_PACKET = 0x0c; + public const ADD_ENTITY_PACKET = 0x0d; + public const REMOVE_ENTITY_PACKET = 0x0e; + public const ADD_ITEM_ENTITY_PACKET = 0x0f; + public const ADD_HANGING_ENTITY_PACKET = 0x10; + public const TAKE_ITEM_ENTITY_PACKET = 0x11; + public const MOVE_ENTITY_PACKET = 0x12; + public const MOVE_PLAYER_PACKET = 0x13; + public const RIDER_JUMP_PACKET = 0x14; + public const UPDATE_BLOCK_PACKET = 0x15; + public const ADD_PAINTING_PACKET = 0x16; + public const EXPLODE_PACKET = 0x17; + public const LEVEL_SOUND_EVENT_PACKET = 0x18; + public const LEVEL_EVENT_PACKET = 0x19; + public const BLOCK_EVENT_PACKET = 0x1a; + public const ENTITY_EVENT_PACKET = 0x1b; + public const MOB_EFFECT_PACKET = 0x1c; + public const UPDATE_ATTRIBUTES_PACKET = 0x1d; + public const INVENTORY_TRANSACTION_PACKET = 0x1e; + public const MOB_EQUIPMENT_PACKET = 0x1f; + public const MOB_ARMOR_EQUIPMENT_PACKET = 0x20; + public const INTERACT_PACKET = 0x21; + public const BLOCK_PICK_REQUEST_PACKET = 0x22; + public const ENTITY_PICK_REQUEST_PACKET = 0x23; + public const PLAYER_ACTION_PACKET = 0x24; + public const ENTITY_FALL_PACKET = 0x25; + public const HURT_ARMOR_PACKET = 0x26; + public const SET_ENTITY_DATA_PACKET = 0x27; + public const SET_ENTITY_MOTION_PACKET = 0x28; + public const SET_ENTITY_LINK_PACKET = 0x29; + public const SET_HEALTH_PACKET = 0x2a; + public const SET_SPAWN_POSITION_PACKET = 0x2b; + public const ANIMATE_PACKET = 0x2c; + public const RESPAWN_PACKET = 0x2d; + public const CONTAINER_OPEN_PACKET = 0x2e; + public const CONTAINER_CLOSE_PACKET = 0x2f; + public const PLAYER_HOTBAR_PACKET = 0x30; + public const INVENTORY_CONTENT_PACKET = 0x31; + public const INVENTORY_SLOT_PACKET = 0x32; + public const CONTAINER_SET_DATA_PACKET = 0x33; + public const CRAFTING_DATA_PACKET = 0x34; + public const CRAFTING_EVENT_PACKET = 0x35; + public const GUI_DATA_PICK_ITEM_PACKET = 0x36; + public const ADVENTURE_SETTINGS_PACKET = 0x37; + public const BLOCK_ENTITY_DATA_PACKET = 0x38; + public const PLAYER_INPUT_PACKET = 0x39; + public const FULL_CHUNK_DATA_PACKET = 0x3a; + public const SET_COMMANDS_ENABLED_PACKET = 0x3b; + public const SET_DIFFICULTY_PACKET = 0x3c; + public const CHANGE_DIMENSION_PACKET = 0x3d; + public const SET_PLAYER_GAME_TYPE_PACKET = 0x3e; + public const PLAYER_LIST_PACKET = 0x3f; + public const SIMPLE_EVENT_PACKET = 0x40; + public const EVENT_PACKET = 0x41; + public const SPAWN_EXPERIENCE_ORB_PACKET = 0x42; + public const CLIENTBOUND_MAP_ITEM_DATA_PACKET = 0x43; + public const MAP_INFO_REQUEST_PACKET = 0x44; + public const REQUEST_CHUNK_RADIUS_PACKET = 0x45; + public const CHUNK_RADIUS_UPDATED_PACKET = 0x46; + public const ITEM_FRAME_DROP_ITEM_PACKET = 0x47; + public const GAME_RULES_CHANGED_PACKET = 0x48; + public const CAMERA_PACKET = 0x49; + public const BOSS_EVENT_PACKET = 0x4a; + public const SHOW_CREDITS_PACKET = 0x4b; + public const AVAILABLE_COMMANDS_PACKET = 0x4c; + public const COMMAND_REQUEST_PACKET = 0x4d; + public const COMMAND_BLOCK_UPDATE_PACKET = 0x4e; + public const COMMAND_OUTPUT_PACKET = 0x4f; + public const UPDATE_TRADE_PACKET = 0x50; + public const UPDATE_EQUIP_PACKET = 0x51; + public const RESOURCE_PACK_DATA_INFO_PACKET = 0x52; + public const RESOURCE_PACK_CHUNK_DATA_PACKET = 0x53; + public const RESOURCE_PACK_CHUNK_REQUEST_PACKET = 0x54; + public const TRANSFER_PACKET = 0x55; + public const PLAY_SOUND_PACKET = 0x56; + public const STOP_SOUND_PACKET = 0x57; + public const SET_TITLE_PACKET = 0x58; + public const ADD_BEHAVIOR_TREE_PACKET = 0x59; + public const STRUCTURE_BLOCK_UPDATE_PACKET = 0x5a; + public const SHOW_STORE_OFFER_PACKET = 0x5b; + public const PURCHASE_RECEIPT_PACKET = 0x5c; + public const PLAYER_SKIN_PACKET = 0x5d; + public const SUB_CLIENT_LOGIN_PACKET = 0x5e; + public const W_S_CONNECT_PACKET = 0x5f; + public const SET_LAST_HURT_BY_PACKET = 0x60; + public const BOOK_EDIT_PACKET = 0x61; + public const NPC_REQUEST_PACKET = 0x62; + public const PHOTO_TRANSFER_PACKET = 0x63; + public const MODAL_FORM_REQUEST_PACKET = 0x64; + public const MODAL_FORM_RESPONSE_PACKET = 0x65; + public const SERVER_SETTINGS_REQUEST_PACKET = 0x66; + public const SERVER_SETTINGS_RESPONSE_PACKET = 0x67; + public const SHOW_PROFILE_PACKET = 0x68; + public const SET_DEFAULT_GAME_TYPE_PACKET = 0x69; } diff --git a/src/pocketmine/network/mcpe/protocol/PurchaseReceiptPacket.php b/src/pocketmine/network/mcpe/protocol/PurchaseReceiptPacket.php index 3b1c949bb..24c49f9dd 100644 --- a/src/pocketmine/network/mcpe/protocol/PurchaseReceiptPacket.php +++ b/src/pocketmine/network/mcpe/protocol/PurchaseReceiptPacket.php @@ -28,7 +28,7 @@ namespace pocketmine\network\mcpe\protocol; use pocketmine\network\mcpe\NetworkSession; class PurchaseReceiptPacket extends DataPacket{ - const NETWORK_ID = ProtocolInfo::PURCHASE_RECEIPT_PACKET; + public const NETWORK_ID = ProtocolInfo::PURCHASE_RECEIPT_PACKET; /** @var string[] */ public $entries = []; diff --git a/src/pocketmine/network/mcpe/protocol/RemoveEntityPacket.php b/src/pocketmine/network/mcpe/protocol/RemoveEntityPacket.php index 7dd2b9887..42a25c93b 100644 --- a/src/pocketmine/network/mcpe/protocol/RemoveEntityPacket.php +++ b/src/pocketmine/network/mcpe/protocol/RemoveEntityPacket.php @@ -29,7 +29,7 @@ namespace pocketmine\network\mcpe\protocol; use pocketmine\network\mcpe\NetworkSession; class RemoveEntityPacket extends DataPacket{ - const NETWORK_ID = ProtocolInfo::REMOVE_ENTITY_PACKET; + public const NETWORK_ID = ProtocolInfo::REMOVE_ENTITY_PACKET; /** @var int */ public $entityUniqueId; diff --git a/src/pocketmine/network/mcpe/protocol/RequestChunkRadiusPacket.php b/src/pocketmine/network/mcpe/protocol/RequestChunkRadiusPacket.php index 486493290..d9130d195 100644 --- a/src/pocketmine/network/mcpe/protocol/RequestChunkRadiusPacket.php +++ b/src/pocketmine/network/mcpe/protocol/RequestChunkRadiusPacket.php @@ -29,7 +29,7 @@ namespace pocketmine\network\mcpe\protocol; use pocketmine\network\mcpe\NetworkSession; class RequestChunkRadiusPacket extends DataPacket{ - const NETWORK_ID = ProtocolInfo::REQUEST_CHUNK_RADIUS_PACKET; + public const NETWORK_ID = ProtocolInfo::REQUEST_CHUNK_RADIUS_PACKET; /** @var int */ public $radius; diff --git a/src/pocketmine/network/mcpe/protocol/ResourcePackChunkDataPacket.php b/src/pocketmine/network/mcpe/protocol/ResourcePackChunkDataPacket.php index 180985546..58337867a 100644 --- a/src/pocketmine/network/mcpe/protocol/ResourcePackChunkDataPacket.php +++ b/src/pocketmine/network/mcpe/protocol/ResourcePackChunkDataPacket.php @@ -30,7 +30,7 @@ namespace pocketmine\network\mcpe\protocol; use pocketmine\network\mcpe\NetworkSession; class ResourcePackChunkDataPacket extends DataPacket{ - const NETWORK_ID = ProtocolInfo::RESOURCE_PACK_CHUNK_DATA_PACKET; + public const NETWORK_ID = ProtocolInfo::RESOURCE_PACK_CHUNK_DATA_PACKET; /** @var string */ public $packId; diff --git a/src/pocketmine/network/mcpe/protocol/ResourcePackChunkRequestPacket.php b/src/pocketmine/network/mcpe/protocol/ResourcePackChunkRequestPacket.php index 711d238c7..59093935d 100644 --- a/src/pocketmine/network/mcpe/protocol/ResourcePackChunkRequestPacket.php +++ b/src/pocketmine/network/mcpe/protocol/ResourcePackChunkRequestPacket.php @@ -30,7 +30,7 @@ namespace pocketmine\network\mcpe\protocol; use pocketmine\network\mcpe\NetworkSession; class ResourcePackChunkRequestPacket extends DataPacket{ - const NETWORK_ID = ProtocolInfo::RESOURCE_PACK_CHUNK_REQUEST_PACKET; + public const NETWORK_ID = ProtocolInfo::RESOURCE_PACK_CHUNK_REQUEST_PACKET; /** @var string */ public $packId; diff --git a/src/pocketmine/network/mcpe/protocol/ResourcePackClientResponsePacket.php b/src/pocketmine/network/mcpe/protocol/ResourcePackClientResponsePacket.php index 41f3a47a2..6346d829b 100644 --- a/src/pocketmine/network/mcpe/protocol/ResourcePackClientResponsePacket.php +++ b/src/pocketmine/network/mcpe/protocol/ResourcePackClientResponsePacket.php @@ -29,12 +29,12 @@ namespace pocketmine\network\mcpe\protocol; use pocketmine\network\mcpe\NetworkSession; class ResourcePackClientResponsePacket extends DataPacket{ - const NETWORK_ID = ProtocolInfo::RESOURCE_PACK_CLIENT_RESPONSE_PACKET; + public const NETWORK_ID = ProtocolInfo::RESOURCE_PACK_CLIENT_RESPONSE_PACKET; - const STATUS_REFUSED = 1; - const STATUS_SEND_PACKS = 2; - const STATUS_HAVE_ALL_PACKS = 3; - const STATUS_COMPLETED = 4; + public const STATUS_REFUSED = 1; + public const STATUS_SEND_PACKS = 2; + public const STATUS_HAVE_ALL_PACKS = 3; + public const STATUS_COMPLETED = 4; /** @var int */ public $status; diff --git a/src/pocketmine/network/mcpe/protocol/ResourcePackDataInfoPacket.php b/src/pocketmine/network/mcpe/protocol/ResourcePackDataInfoPacket.php index f237952ec..ec520ab0a 100644 --- a/src/pocketmine/network/mcpe/protocol/ResourcePackDataInfoPacket.php +++ b/src/pocketmine/network/mcpe/protocol/ResourcePackDataInfoPacket.php @@ -30,7 +30,7 @@ namespace pocketmine\network\mcpe\protocol; use pocketmine\network\mcpe\NetworkSession; class ResourcePackDataInfoPacket extends DataPacket{ - const NETWORK_ID = ProtocolInfo::RESOURCE_PACK_DATA_INFO_PACKET; + public const NETWORK_ID = ProtocolInfo::RESOURCE_PACK_DATA_INFO_PACKET; /** @var string */ public $packId; diff --git a/src/pocketmine/network/mcpe/protocol/ResourcePackStackPacket.php b/src/pocketmine/network/mcpe/protocol/ResourcePackStackPacket.php index ae070c55c..73b5d6b34 100644 --- a/src/pocketmine/network/mcpe/protocol/ResourcePackStackPacket.php +++ b/src/pocketmine/network/mcpe/protocol/ResourcePackStackPacket.php @@ -32,7 +32,7 @@ use pocketmine\resourcepacks\ResourcePack; use pocketmine\resourcepacks\ResourcePackInfoEntry; class ResourcePackStackPacket extends DataPacket{ - const NETWORK_ID = ProtocolInfo::RESOURCE_PACK_STACK_PACKET; + public const NETWORK_ID = ProtocolInfo::RESOURCE_PACK_STACK_PACKET; /** @var bool */ public $mustAccept = false; diff --git a/src/pocketmine/network/mcpe/protocol/ResourcePacksInfoPacket.php b/src/pocketmine/network/mcpe/protocol/ResourcePacksInfoPacket.php index 1dc2b3853..fff647d84 100644 --- a/src/pocketmine/network/mcpe/protocol/ResourcePacksInfoPacket.php +++ b/src/pocketmine/network/mcpe/protocol/ResourcePacksInfoPacket.php @@ -31,7 +31,7 @@ use pocketmine\resourcepacks\ResourcePack; use pocketmine\resourcepacks\ResourcePackInfoEntry; class ResourcePacksInfoPacket extends DataPacket{ - const NETWORK_ID = ProtocolInfo::RESOURCE_PACKS_INFO_PACKET; + public const NETWORK_ID = ProtocolInfo::RESOURCE_PACKS_INFO_PACKET; /** @var bool */ public $mustAccept = false; //if true, forces client to use selected resource packs diff --git a/src/pocketmine/network/mcpe/protocol/RespawnPacket.php b/src/pocketmine/network/mcpe/protocol/RespawnPacket.php index 5553713cd..35c504431 100644 --- a/src/pocketmine/network/mcpe/protocol/RespawnPacket.php +++ b/src/pocketmine/network/mcpe/protocol/RespawnPacket.php @@ -30,7 +30,7 @@ use pocketmine\math\Vector3; use pocketmine\network\mcpe\NetworkSession; class RespawnPacket extends DataPacket{ - const NETWORK_ID = ProtocolInfo::RESPAWN_PACKET; + public const NETWORK_ID = ProtocolInfo::RESPAWN_PACKET; /** @var Vector3 */ public $position; diff --git a/src/pocketmine/network/mcpe/protocol/RiderJumpPacket.php b/src/pocketmine/network/mcpe/protocol/RiderJumpPacket.php index 9b9eb7dcc..0e2d13b20 100644 --- a/src/pocketmine/network/mcpe/protocol/RiderJumpPacket.php +++ b/src/pocketmine/network/mcpe/protocol/RiderJumpPacket.php @@ -30,7 +30,7 @@ namespace pocketmine\network\mcpe\protocol; use pocketmine\network\mcpe\NetworkSession; class RiderJumpPacket extends DataPacket{ - const NETWORK_ID = ProtocolInfo::RIDER_JUMP_PACKET; + public const NETWORK_ID = ProtocolInfo::RIDER_JUMP_PACKET; /** @var int */ public $unknown; diff --git a/src/pocketmine/network/mcpe/protocol/ServerSettingsRequestPacket.php b/src/pocketmine/network/mcpe/protocol/ServerSettingsRequestPacket.php index a5e6d9521..e48716813 100644 --- a/src/pocketmine/network/mcpe/protocol/ServerSettingsRequestPacket.php +++ b/src/pocketmine/network/mcpe/protocol/ServerSettingsRequestPacket.php @@ -28,7 +28,7 @@ namespace pocketmine\network\mcpe\protocol; use pocketmine\network\mcpe\NetworkSession; class ServerSettingsRequestPacket extends DataPacket{ - const NETWORK_ID = ProtocolInfo::SERVER_SETTINGS_REQUEST_PACKET; + public const NETWORK_ID = ProtocolInfo::SERVER_SETTINGS_REQUEST_PACKET; protected function decodePayload(){ //No payload diff --git a/src/pocketmine/network/mcpe/protocol/ServerSettingsResponsePacket.php b/src/pocketmine/network/mcpe/protocol/ServerSettingsResponsePacket.php index 39a9d3aa3..96dac9691 100644 --- a/src/pocketmine/network/mcpe/protocol/ServerSettingsResponsePacket.php +++ b/src/pocketmine/network/mcpe/protocol/ServerSettingsResponsePacket.php @@ -28,7 +28,7 @@ namespace pocketmine\network\mcpe\protocol; use pocketmine\network\mcpe\NetworkSession; class ServerSettingsResponsePacket extends DataPacket{ - const NETWORK_ID = ProtocolInfo::SERVER_SETTINGS_RESPONSE_PACKET; + public const NETWORK_ID = ProtocolInfo::SERVER_SETTINGS_RESPONSE_PACKET; /** @var int */ public $formId; diff --git a/src/pocketmine/network/mcpe/protocol/ServerToClientHandshakePacket.php b/src/pocketmine/network/mcpe/protocol/ServerToClientHandshakePacket.php index 92b4d77ac..841bf0e2d 100644 --- a/src/pocketmine/network/mcpe/protocol/ServerToClientHandshakePacket.php +++ b/src/pocketmine/network/mcpe/protocol/ServerToClientHandshakePacket.php @@ -29,7 +29,7 @@ namespace pocketmine\network\mcpe\protocol; use pocketmine\network\mcpe\NetworkSession; class ServerToClientHandshakePacket extends DataPacket{ - const NETWORK_ID = ProtocolInfo::SERVER_TO_CLIENT_HANDSHAKE_PACKET; + public const NETWORK_ID = ProtocolInfo::SERVER_TO_CLIENT_HANDSHAKE_PACKET; /** * @var string diff --git a/src/pocketmine/network/mcpe/protocol/SetCommandsEnabledPacket.php b/src/pocketmine/network/mcpe/protocol/SetCommandsEnabledPacket.php index 8151b99ea..b6a44e582 100644 --- a/src/pocketmine/network/mcpe/protocol/SetCommandsEnabledPacket.php +++ b/src/pocketmine/network/mcpe/protocol/SetCommandsEnabledPacket.php @@ -29,7 +29,7 @@ namespace pocketmine\network\mcpe\protocol; use pocketmine\network\mcpe\NetworkSession; class SetCommandsEnabledPacket extends DataPacket{ - const NETWORK_ID = ProtocolInfo::SET_COMMANDS_ENABLED_PACKET; + public const NETWORK_ID = ProtocolInfo::SET_COMMANDS_ENABLED_PACKET; /** @var bool */ public $enabled; diff --git a/src/pocketmine/network/mcpe/protocol/SetDefaultGameTypePacket.php b/src/pocketmine/network/mcpe/protocol/SetDefaultGameTypePacket.php index 6ca31d3d9..87fe91841 100644 --- a/src/pocketmine/network/mcpe/protocol/SetDefaultGameTypePacket.php +++ b/src/pocketmine/network/mcpe/protocol/SetDefaultGameTypePacket.php @@ -28,7 +28,7 @@ namespace pocketmine\network\mcpe\protocol; use pocketmine\network\mcpe\NetworkSession; class SetDefaultGameTypePacket extends DataPacket{ - const NETWORK_ID = ProtocolInfo::SET_DEFAULT_GAME_TYPE_PACKET; + public const NETWORK_ID = ProtocolInfo::SET_DEFAULT_GAME_TYPE_PACKET; /** @var int */ public $gamemode; diff --git a/src/pocketmine/network/mcpe/protocol/SetDifficultyPacket.php b/src/pocketmine/network/mcpe/protocol/SetDifficultyPacket.php index f4c75ebd9..95cb36c3c 100644 --- a/src/pocketmine/network/mcpe/protocol/SetDifficultyPacket.php +++ b/src/pocketmine/network/mcpe/protocol/SetDifficultyPacket.php @@ -29,7 +29,7 @@ namespace pocketmine\network\mcpe\protocol; use pocketmine\network\mcpe\NetworkSession; class SetDifficultyPacket extends DataPacket{ - const NETWORK_ID = ProtocolInfo::SET_DIFFICULTY_PACKET; + public const NETWORK_ID = ProtocolInfo::SET_DIFFICULTY_PACKET; /** @var int */ public $difficulty; diff --git a/src/pocketmine/network/mcpe/protocol/SetEntityDataPacket.php b/src/pocketmine/network/mcpe/protocol/SetEntityDataPacket.php index 38cf670fe..678cfda61 100644 --- a/src/pocketmine/network/mcpe/protocol/SetEntityDataPacket.php +++ b/src/pocketmine/network/mcpe/protocol/SetEntityDataPacket.php @@ -29,7 +29,7 @@ namespace pocketmine\network\mcpe\protocol; use pocketmine\network\mcpe\NetworkSession; class SetEntityDataPacket extends DataPacket{ - const NETWORK_ID = ProtocolInfo::SET_ENTITY_DATA_PACKET; + public const NETWORK_ID = ProtocolInfo::SET_ENTITY_DATA_PACKET; /** @var int */ public $entityRuntimeId; diff --git a/src/pocketmine/network/mcpe/protocol/SetEntityLinkPacket.php b/src/pocketmine/network/mcpe/protocol/SetEntityLinkPacket.php index e1108c45a..a7e3862fe 100644 --- a/src/pocketmine/network/mcpe/protocol/SetEntityLinkPacket.php +++ b/src/pocketmine/network/mcpe/protocol/SetEntityLinkPacket.php @@ -30,7 +30,7 @@ use pocketmine\network\mcpe\NetworkSession; use pocketmine\network\mcpe\protocol\types\EntityLink; class SetEntityLinkPacket extends DataPacket{ - const NETWORK_ID = ProtocolInfo::SET_ENTITY_LINK_PACKET; + public const NETWORK_ID = ProtocolInfo::SET_ENTITY_LINK_PACKET; /** @var EntityLink */ public $link; diff --git a/src/pocketmine/network/mcpe/protocol/SetEntityMotionPacket.php b/src/pocketmine/network/mcpe/protocol/SetEntityMotionPacket.php index 4ddce4db7..2da1e4bd0 100644 --- a/src/pocketmine/network/mcpe/protocol/SetEntityMotionPacket.php +++ b/src/pocketmine/network/mcpe/protocol/SetEntityMotionPacket.php @@ -30,7 +30,7 @@ use pocketmine\math\Vector3; use pocketmine\network\mcpe\NetworkSession; class SetEntityMotionPacket extends DataPacket{ - const NETWORK_ID = ProtocolInfo::SET_ENTITY_MOTION_PACKET; + public const NETWORK_ID = ProtocolInfo::SET_ENTITY_MOTION_PACKET; /** @var int */ public $entityRuntimeId; diff --git a/src/pocketmine/network/mcpe/protocol/SetHealthPacket.php b/src/pocketmine/network/mcpe/protocol/SetHealthPacket.php index 522c762c4..0ab3dc87c 100644 --- a/src/pocketmine/network/mcpe/protocol/SetHealthPacket.php +++ b/src/pocketmine/network/mcpe/protocol/SetHealthPacket.php @@ -29,7 +29,7 @@ namespace pocketmine\network\mcpe\protocol; use pocketmine\network\mcpe\NetworkSession; class SetHealthPacket extends DataPacket{ - const NETWORK_ID = ProtocolInfo::SET_HEALTH_PACKET; + public const NETWORK_ID = ProtocolInfo::SET_HEALTH_PACKET; /** @var int */ public $health; diff --git a/src/pocketmine/network/mcpe/protocol/SetLastHurtByPacket.php b/src/pocketmine/network/mcpe/protocol/SetLastHurtByPacket.php index 94c84c592..0b29e86ad 100644 --- a/src/pocketmine/network/mcpe/protocol/SetLastHurtByPacket.php +++ b/src/pocketmine/network/mcpe/protocol/SetLastHurtByPacket.php @@ -28,7 +28,7 @@ namespace pocketmine\network\mcpe\protocol; use pocketmine\network\mcpe\NetworkSession; class SetLastHurtByPacket extends DataPacket{ - const NETWORK_ID = ProtocolInfo::SET_LAST_HURT_BY_PACKET; + public const NETWORK_ID = ProtocolInfo::SET_LAST_HURT_BY_PACKET; /** @var int */ public $entityTypeId; diff --git a/src/pocketmine/network/mcpe/protocol/SetPlayerGameTypePacket.php b/src/pocketmine/network/mcpe/protocol/SetPlayerGameTypePacket.php index ec5a12bf5..4f743b7af 100644 --- a/src/pocketmine/network/mcpe/protocol/SetPlayerGameTypePacket.php +++ b/src/pocketmine/network/mcpe/protocol/SetPlayerGameTypePacket.php @@ -29,7 +29,7 @@ namespace pocketmine\network\mcpe\protocol; use pocketmine\network\mcpe\NetworkSession; class SetPlayerGameTypePacket extends DataPacket{ - const NETWORK_ID = ProtocolInfo::SET_PLAYER_GAME_TYPE_PACKET; + public const NETWORK_ID = ProtocolInfo::SET_PLAYER_GAME_TYPE_PACKET; /** @var int */ public $gamemode; diff --git a/src/pocketmine/network/mcpe/protocol/SetSpawnPositionPacket.php b/src/pocketmine/network/mcpe/protocol/SetSpawnPositionPacket.php index a691a007d..659f87526 100644 --- a/src/pocketmine/network/mcpe/protocol/SetSpawnPositionPacket.php +++ b/src/pocketmine/network/mcpe/protocol/SetSpawnPositionPacket.php @@ -29,10 +29,10 @@ namespace pocketmine\network\mcpe\protocol; use pocketmine\network\mcpe\NetworkSession; class SetSpawnPositionPacket extends DataPacket{ - const NETWORK_ID = ProtocolInfo::SET_SPAWN_POSITION_PACKET; + public const NETWORK_ID = ProtocolInfo::SET_SPAWN_POSITION_PACKET; - const TYPE_PLAYER_SPAWN = 0; - const TYPE_WORLD_SPAWN = 1; + public const TYPE_PLAYER_SPAWN = 0; + public const TYPE_WORLD_SPAWN = 1; /** @var int */ public $spawnType; diff --git a/src/pocketmine/network/mcpe/protocol/SetTimePacket.php b/src/pocketmine/network/mcpe/protocol/SetTimePacket.php index 7c3db17b1..c9404e5e0 100644 --- a/src/pocketmine/network/mcpe/protocol/SetTimePacket.php +++ b/src/pocketmine/network/mcpe/protocol/SetTimePacket.php @@ -28,7 +28,7 @@ namespace pocketmine\network\mcpe\protocol; use pocketmine\network\mcpe\NetworkSession; class SetTimePacket extends DataPacket{ - const NETWORK_ID = ProtocolInfo::SET_TIME_PACKET; + public const NETWORK_ID = ProtocolInfo::SET_TIME_PACKET; /** @var int */ public $time; diff --git a/src/pocketmine/network/mcpe/protocol/SetTitlePacket.php b/src/pocketmine/network/mcpe/protocol/SetTitlePacket.php index 53093806c..b5aef453c 100644 --- a/src/pocketmine/network/mcpe/protocol/SetTitlePacket.php +++ b/src/pocketmine/network/mcpe/protocol/SetTitlePacket.php @@ -30,14 +30,14 @@ namespace pocketmine\network\mcpe\protocol; use pocketmine\network\mcpe\NetworkSession; class SetTitlePacket extends DataPacket{ - const NETWORK_ID = ProtocolInfo::SET_TITLE_PACKET; + public const NETWORK_ID = ProtocolInfo::SET_TITLE_PACKET; - const TYPE_CLEAR_TITLE = 0; - const TYPE_RESET_TITLE = 1; - const TYPE_SET_TITLE = 2; - const TYPE_SET_SUBTITLE = 3; - const TYPE_SET_ACTIONBAR_MESSAGE = 4; - const TYPE_SET_ANIMATION_TIMES = 5; + public const TYPE_CLEAR_TITLE = 0; + public const TYPE_RESET_TITLE = 1; + public const TYPE_SET_TITLE = 2; + public const TYPE_SET_SUBTITLE = 3; + public const TYPE_SET_ACTIONBAR_MESSAGE = 4; + public const TYPE_SET_ANIMATION_TIMES = 5; /** @var int */ public $type; diff --git a/src/pocketmine/network/mcpe/protocol/ShowCreditsPacket.php b/src/pocketmine/network/mcpe/protocol/ShowCreditsPacket.php index ae8a1ce34..1260374bf 100644 --- a/src/pocketmine/network/mcpe/protocol/ShowCreditsPacket.php +++ b/src/pocketmine/network/mcpe/protocol/ShowCreditsPacket.php @@ -30,10 +30,10 @@ namespace pocketmine\network\mcpe\protocol; use pocketmine\network\mcpe\NetworkSession; class ShowCreditsPacket extends DataPacket{ - const NETWORK_ID = ProtocolInfo::SHOW_CREDITS_PACKET; + public const NETWORK_ID = ProtocolInfo::SHOW_CREDITS_PACKET; - const STATUS_START_CREDITS = 0; - const STATUS_END_CREDITS = 1; + public const STATUS_START_CREDITS = 0; + public const STATUS_END_CREDITS = 1; /** @var int */ public $playerEid; diff --git a/src/pocketmine/network/mcpe/protocol/ShowProfilePacket.php b/src/pocketmine/network/mcpe/protocol/ShowProfilePacket.php index 7c1bfb7ef..748e9a3de 100644 --- a/src/pocketmine/network/mcpe/protocol/ShowProfilePacket.php +++ b/src/pocketmine/network/mcpe/protocol/ShowProfilePacket.php @@ -28,7 +28,7 @@ namespace pocketmine\network\mcpe\protocol; use pocketmine\network\mcpe\NetworkSession; class ShowProfilePacket extends DataPacket{ - const NETWORK_ID = ProtocolInfo::SHOW_PROFILE_PACKET; + public const NETWORK_ID = ProtocolInfo::SHOW_PROFILE_PACKET; /** @var string */ public $xuid; diff --git a/src/pocketmine/network/mcpe/protocol/ShowStoreOfferPacket.php b/src/pocketmine/network/mcpe/protocol/ShowStoreOfferPacket.php index f2cfe334d..f7d706a27 100644 --- a/src/pocketmine/network/mcpe/protocol/ShowStoreOfferPacket.php +++ b/src/pocketmine/network/mcpe/protocol/ShowStoreOfferPacket.php @@ -28,7 +28,7 @@ namespace pocketmine\network\mcpe\protocol; use pocketmine\network\mcpe\NetworkSession; class ShowStoreOfferPacket extends DataPacket{ - const NETWORK_ID = ProtocolInfo::SHOW_STORE_OFFER_PACKET; + public const NETWORK_ID = ProtocolInfo::SHOW_STORE_OFFER_PACKET; /** @var string */ public $offerId; diff --git a/src/pocketmine/network/mcpe/protocol/SimpleEventPacket.php b/src/pocketmine/network/mcpe/protocol/SimpleEventPacket.php index f9e70a056..5c90c21af 100644 --- a/src/pocketmine/network/mcpe/protocol/SimpleEventPacket.php +++ b/src/pocketmine/network/mcpe/protocol/SimpleEventPacket.php @@ -28,7 +28,7 @@ namespace pocketmine\network\mcpe\protocol; use pocketmine\network\mcpe\NetworkSession; class SimpleEventPacket extends DataPacket{ - const NETWORK_ID = ProtocolInfo::SIMPLE_EVENT_PACKET; + public const NETWORK_ID = ProtocolInfo::SIMPLE_EVENT_PACKET; /** @var int */ public $unknownShort1; diff --git a/src/pocketmine/network/mcpe/protocol/SpawnExperienceOrbPacket.php b/src/pocketmine/network/mcpe/protocol/SpawnExperienceOrbPacket.php index bf60e8c00..6ca906dca 100644 --- a/src/pocketmine/network/mcpe/protocol/SpawnExperienceOrbPacket.php +++ b/src/pocketmine/network/mcpe/protocol/SpawnExperienceOrbPacket.php @@ -30,7 +30,7 @@ use pocketmine\math\Vector3; use pocketmine\network\mcpe\NetworkSession; class SpawnExperienceOrbPacket extends DataPacket{ - const NETWORK_ID = ProtocolInfo::SPAWN_EXPERIENCE_ORB_PACKET; + public const NETWORK_ID = ProtocolInfo::SPAWN_EXPERIENCE_ORB_PACKET; /** @var Vector3 */ public $position; diff --git a/src/pocketmine/network/mcpe/protocol/StartGamePacket.php b/src/pocketmine/network/mcpe/protocol/StartGamePacket.php index 7abf1c8f8..20dfcb8f9 100644 --- a/src/pocketmine/network/mcpe/protocol/StartGamePacket.php +++ b/src/pocketmine/network/mcpe/protocol/StartGamePacket.php @@ -31,7 +31,7 @@ use pocketmine\network\mcpe\NetworkSession; use pocketmine\network\mcpe\protocol\types\PlayerPermissions; class StartGamePacket extends DataPacket{ - const NETWORK_ID = ProtocolInfo::START_GAME_PACKET; + public const NETWORK_ID = ProtocolInfo::START_GAME_PACKET; /** @var int */ public $entityUniqueId; diff --git a/src/pocketmine/network/mcpe/protocol/StopSoundPacket.php b/src/pocketmine/network/mcpe/protocol/StopSoundPacket.php index dc671f9ca..46a567f25 100644 --- a/src/pocketmine/network/mcpe/protocol/StopSoundPacket.php +++ b/src/pocketmine/network/mcpe/protocol/StopSoundPacket.php @@ -30,7 +30,7 @@ namespace pocketmine\network\mcpe\protocol; use pocketmine\network\mcpe\NetworkSession; class StopSoundPacket extends DataPacket{ - const NETWORK_ID = ProtocolInfo::STOP_SOUND_PACKET; + public const NETWORK_ID = ProtocolInfo::STOP_SOUND_PACKET; /** @var string */ public $soundName; diff --git a/src/pocketmine/network/mcpe/protocol/StructureBlockUpdatePacket.php b/src/pocketmine/network/mcpe/protocol/StructureBlockUpdatePacket.php index 5492cf092..1c5f212ab 100644 --- a/src/pocketmine/network/mcpe/protocol/StructureBlockUpdatePacket.php +++ b/src/pocketmine/network/mcpe/protocol/StructureBlockUpdatePacket.php @@ -28,7 +28,7 @@ namespace pocketmine\network\mcpe\protocol; use pocketmine\network\mcpe\NetworkSession; class StructureBlockUpdatePacket extends DataPacket{ - const NETWORK_ID = ProtocolInfo::STRUCTURE_BLOCK_UPDATE_PACKET; + public const NETWORK_ID = ProtocolInfo::STRUCTURE_BLOCK_UPDATE_PACKET; protected function decodePayload(){ //TODO diff --git a/src/pocketmine/network/mcpe/protocol/SubClientLoginPacket.php b/src/pocketmine/network/mcpe/protocol/SubClientLoginPacket.php index 4b048eec3..00516837e 100644 --- a/src/pocketmine/network/mcpe/protocol/SubClientLoginPacket.php +++ b/src/pocketmine/network/mcpe/protocol/SubClientLoginPacket.php @@ -28,7 +28,7 @@ namespace pocketmine\network\mcpe\protocol; use pocketmine\network\mcpe\NetworkSession; class SubClientLoginPacket extends DataPacket{ - const NETWORK_ID = ProtocolInfo::SUB_CLIENT_LOGIN_PACKET; + public const NETWORK_ID = ProtocolInfo::SUB_CLIENT_LOGIN_PACKET; /** @var string */ public $connectionRequestData; diff --git a/src/pocketmine/network/mcpe/protocol/TakeItemEntityPacket.php b/src/pocketmine/network/mcpe/protocol/TakeItemEntityPacket.php index 02b3fd210..5fbe7a6be 100644 --- a/src/pocketmine/network/mcpe/protocol/TakeItemEntityPacket.php +++ b/src/pocketmine/network/mcpe/protocol/TakeItemEntityPacket.php @@ -29,7 +29,7 @@ namespace pocketmine\network\mcpe\protocol; use pocketmine\network\mcpe\NetworkSession; class TakeItemEntityPacket extends DataPacket{ - const NETWORK_ID = ProtocolInfo::TAKE_ITEM_ENTITY_PACKET; + public const NETWORK_ID = ProtocolInfo::TAKE_ITEM_ENTITY_PACKET; /** @var int */ public $target; diff --git a/src/pocketmine/network/mcpe/protocol/TextPacket.php b/src/pocketmine/network/mcpe/protocol/TextPacket.php index 7c090c240..71b606b82 100644 --- a/src/pocketmine/network/mcpe/protocol/TextPacket.php +++ b/src/pocketmine/network/mcpe/protocol/TextPacket.php @@ -29,17 +29,17 @@ namespace pocketmine\network\mcpe\protocol; use pocketmine\network\mcpe\NetworkSession; class TextPacket extends DataPacket{ - const NETWORK_ID = ProtocolInfo::TEXT_PACKET; + public const NETWORK_ID = ProtocolInfo::TEXT_PACKET; - const TYPE_RAW = 0; - const TYPE_CHAT = 1; - const TYPE_TRANSLATION = 2; - const TYPE_POPUP = 3; - const TYPE_JUKEBOX_POPUP = 4; - const TYPE_TIP = 5; - const TYPE_SYSTEM = 6; - const TYPE_WHISPER = 7; - const TYPE_ANNOUNCEMENT = 8; + public const TYPE_RAW = 0; + public const TYPE_CHAT = 1; + public const TYPE_TRANSLATION = 2; + public const TYPE_POPUP = 3; + public const TYPE_JUKEBOX_POPUP = 4; + public const TYPE_TIP = 5; + public const TYPE_SYSTEM = 6; + public const TYPE_WHISPER = 7; + public const TYPE_ANNOUNCEMENT = 8; /** @var int */ public $type; diff --git a/src/pocketmine/network/mcpe/protocol/TransferPacket.php b/src/pocketmine/network/mcpe/protocol/TransferPacket.php index 5d40e5ac9..4c27c6009 100644 --- a/src/pocketmine/network/mcpe/protocol/TransferPacket.php +++ b/src/pocketmine/network/mcpe/protocol/TransferPacket.php @@ -28,7 +28,7 @@ namespace pocketmine\network\mcpe\protocol; use pocketmine\network\mcpe\NetworkSession; class TransferPacket extends DataPacket{ - const NETWORK_ID = ProtocolInfo::TRANSFER_PACKET; + public const NETWORK_ID = ProtocolInfo::TRANSFER_PACKET; /** @var string */ public $address; diff --git a/src/pocketmine/network/mcpe/protocol/UnknownPacket.php b/src/pocketmine/network/mcpe/protocol/UnknownPacket.php index f628181d7..25bf8d3d4 100644 --- a/src/pocketmine/network/mcpe/protocol/UnknownPacket.php +++ b/src/pocketmine/network/mcpe/protocol/UnknownPacket.php @@ -28,7 +28,7 @@ namespace pocketmine\network\mcpe\protocol; use pocketmine\network\mcpe\NetworkSession; class UnknownPacket extends DataPacket{ - const NETWORK_ID = -1; //Invalid, do not try to write this + public const NETWORK_ID = -1; //Invalid, do not try to write this /** @var string */ public $payload; diff --git a/src/pocketmine/network/mcpe/protocol/UpdateAttributesPacket.php b/src/pocketmine/network/mcpe/protocol/UpdateAttributesPacket.php index 1b0236078..656ed350d 100644 --- a/src/pocketmine/network/mcpe/protocol/UpdateAttributesPacket.php +++ b/src/pocketmine/network/mcpe/protocol/UpdateAttributesPacket.php @@ -30,7 +30,7 @@ use pocketmine\entity\Attribute; use pocketmine\network\mcpe\NetworkSession; class UpdateAttributesPacket extends DataPacket{ - const NETWORK_ID = ProtocolInfo::UPDATE_ATTRIBUTES_PACKET; + public const NETWORK_ID = ProtocolInfo::UPDATE_ATTRIBUTES_PACKET; /** @var int */ public $entityRuntimeId; diff --git a/src/pocketmine/network/mcpe/protocol/UpdateBlockPacket.php b/src/pocketmine/network/mcpe/protocol/UpdateBlockPacket.php index e46dbe96e..76067e70f 100644 --- a/src/pocketmine/network/mcpe/protocol/UpdateBlockPacket.php +++ b/src/pocketmine/network/mcpe/protocol/UpdateBlockPacket.php @@ -29,16 +29,16 @@ namespace pocketmine\network\mcpe\protocol; use pocketmine\network\mcpe\NetworkSession; class UpdateBlockPacket extends DataPacket{ - const NETWORK_ID = ProtocolInfo::UPDATE_BLOCK_PACKET; + public const NETWORK_ID = ProtocolInfo::UPDATE_BLOCK_PACKET; - const FLAG_NONE = 0b0000; - const FLAG_NEIGHBORS = 0b0001; - const FLAG_NETWORK = 0b0010; - const FLAG_NOGRAPHIC = 0b0100; - const FLAG_PRIORITY = 0b1000; + public const FLAG_NONE = 0b0000; + public const FLAG_NEIGHBORS = 0b0001; + public const FLAG_NETWORK = 0b0010; + public const FLAG_NOGRAPHIC = 0b0100; + public const FLAG_PRIORITY = 0b1000; - const FLAG_ALL = self::FLAG_NEIGHBORS | self::FLAG_NETWORK; - const FLAG_ALL_PRIORITY = self::FLAG_ALL | self::FLAG_PRIORITY; + public const FLAG_ALL = self::FLAG_NEIGHBORS | self::FLAG_NETWORK; + public const FLAG_ALL_PRIORITY = self::FLAG_ALL | self::FLAG_PRIORITY; /** @var int */ public $x; diff --git a/src/pocketmine/network/mcpe/protocol/UpdateEquipPacket.php b/src/pocketmine/network/mcpe/protocol/UpdateEquipPacket.php index 59e53b845..ae6c9f0dd 100644 --- a/src/pocketmine/network/mcpe/protocol/UpdateEquipPacket.php +++ b/src/pocketmine/network/mcpe/protocol/UpdateEquipPacket.php @@ -28,7 +28,7 @@ namespace pocketmine\network\mcpe\protocol; use pocketmine\network\mcpe\NetworkSession; class UpdateEquipPacket extends DataPacket{ - const NETWORK_ID = ProtocolInfo::UPDATE_EQUIP_PACKET; + public const NETWORK_ID = ProtocolInfo::UPDATE_EQUIP_PACKET; /** @var int */ public $windowId; diff --git a/src/pocketmine/network/mcpe/protocol/UpdateTradePacket.php b/src/pocketmine/network/mcpe/protocol/UpdateTradePacket.php index e6a11fa30..2cb6a0f08 100644 --- a/src/pocketmine/network/mcpe/protocol/UpdateTradePacket.php +++ b/src/pocketmine/network/mcpe/protocol/UpdateTradePacket.php @@ -31,7 +31,7 @@ use pocketmine\network\mcpe\NetworkSession; use pocketmine\network\mcpe\protocol\types\WindowTypes; class UpdateTradePacket extends DataPacket{ - const NETWORK_ID = ProtocolInfo::UPDATE_TRADE_PACKET; + public const NETWORK_ID = ProtocolInfo::UPDATE_TRADE_PACKET; //TODO: find fields diff --git a/src/pocketmine/network/mcpe/protocol/WSConnectPacket.php b/src/pocketmine/network/mcpe/protocol/WSConnectPacket.php index 94faea19f..b9ade6a03 100644 --- a/src/pocketmine/network/mcpe/protocol/WSConnectPacket.php +++ b/src/pocketmine/network/mcpe/protocol/WSConnectPacket.php @@ -28,7 +28,7 @@ namespace pocketmine\network\mcpe\protocol; use pocketmine\network\mcpe\NetworkSession; class WSConnectPacket extends DataPacket{ - const NETWORK_ID = ProtocolInfo::W_S_CONNECT_PACKET; + public const NETWORK_ID = ProtocolInfo::W_S_CONNECT_PACKET; /** @var string */ public $string1; diff --git a/src/pocketmine/network/mcpe/protocol/types/ContainerIds.php b/src/pocketmine/network/mcpe/protocol/types/ContainerIds.php index f97ad5a87..198c06c7a 100644 --- a/src/pocketmine/network/mcpe/protocol/types/ContainerIds.php +++ b/src/pocketmine/network/mcpe/protocol/types/ContainerIds.php @@ -25,15 +25,15 @@ namespace pocketmine\network\mcpe\protocol\types; interface ContainerIds{ - const NONE = -1; - const INVENTORY = 0; - const FIRST = 1; - const LAST = 100; - const OFFHAND = 119; - const ARMOR = 120; - const CREATIVE = 121; - const HOTBAR = 122; - const FIXED_INVENTORY = 123; - const CURSOR = 124; + public const NONE = -1; + public const INVENTORY = 0; + public const FIRST = 1; + public const LAST = 100; + public const OFFHAND = 119; + public const ARMOR = 120; + public const CREATIVE = 121; + public const HOTBAR = 122; + public const FIXED_INVENTORY = 123; + public const CURSOR = 124; } \ No newline at end of file diff --git a/src/pocketmine/network/mcpe/protocol/types/DimensionIds.php b/src/pocketmine/network/mcpe/protocol/types/DimensionIds.php index 2567deada..b160e497d 100644 --- a/src/pocketmine/network/mcpe/protocol/types/DimensionIds.php +++ b/src/pocketmine/network/mcpe/protocol/types/DimensionIds.php @@ -25,8 +25,8 @@ namespace pocketmine\network\mcpe\protocol\types; interface DimensionIds{ - const OVERWORLD = 0; - const NETHER = 1; - const THE_END = 2; + public const OVERWORLD = 0; + public const NETHER = 1; + public const THE_END = 2; } \ No newline at end of file diff --git a/src/pocketmine/network/mcpe/protocol/types/NetworkInventoryAction.php b/src/pocketmine/network/mcpe/protocol/types/NetworkInventoryAction.php index 242cf3d9d..18663b037 100644 --- a/src/pocketmine/network/mcpe/protocol/types/NetworkInventoryAction.php +++ b/src/pocketmine/network/mcpe/protocol/types/NetworkInventoryAction.php @@ -34,11 +34,11 @@ use pocketmine\network\mcpe\protocol\InventoryTransactionPacket; use pocketmine\Player; class NetworkInventoryAction{ - const SOURCE_CONTAINER = 0; + public const SOURCE_CONTAINER = 0; - const SOURCE_WORLD = 2; //drop/pickup item entity - const SOURCE_CREATIVE = 3; - const SOURCE_TODO = 99999; + public const SOURCE_WORLD = 2; //drop/pickup item entity + public const SOURCE_CREATIVE = 3; + public const SOURCE_TODO = 99999; /** * Fake window IDs for the SOURCE_TODO type (99999) @@ -49,35 +49,35 @@ class NetworkInventoryAction{ * * Expect these to change in the future. */ - const SOURCE_TYPE_CRAFTING_ADD_INGREDIENT = -2; - const SOURCE_TYPE_CRAFTING_REMOVE_INGREDIENT = -3; - const SOURCE_TYPE_CRAFTING_RESULT = -4; - const SOURCE_TYPE_CRAFTING_USE_INGREDIENT = -5; + public const SOURCE_TYPE_CRAFTING_ADD_INGREDIENT = -2; + public const SOURCE_TYPE_CRAFTING_REMOVE_INGREDIENT = -3; + public const SOURCE_TYPE_CRAFTING_RESULT = -4; + public const SOURCE_TYPE_CRAFTING_USE_INGREDIENT = -5; - const SOURCE_TYPE_ANVIL_INPUT = -10; - const SOURCE_TYPE_ANVIL_MATERIAL = -11; - const SOURCE_TYPE_ANVIL_RESULT = -12; - const SOURCE_TYPE_ANVIL_OUTPUT = -13; + public const SOURCE_TYPE_ANVIL_INPUT = -10; + public const SOURCE_TYPE_ANVIL_MATERIAL = -11; + public const SOURCE_TYPE_ANVIL_RESULT = -12; + public const SOURCE_TYPE_ANVIL_OUTPUT = -13; - const SOURCE_TYPE_ENCHANT_INPUT = -15; - const SOURCE_TYPE_ENCHANT_MATERIAL = -16; - const SOURCE_TYPE_ENCHANT_OUTPUT = -17; + public const SOURCE_TYPE_ENCHANT_INPUT = -15; + public const SOURCE_TYPE_ENCHANT_MATERIAL = -16; + public const SOURCE_TYPE_ENCHANT_OUTPUT = -17; - const SOURCE_TYPE_TRADING_INPUT_1 = -20; - const SOURCE_TYPE_TRADING_INPUT_2 = -21; - const SOURCE_TYPE_TRADING_USE_INPUTS = -22; - const SOURCE_TYPE_TRADING_OUTPUT = -23; + public const SOURCE_TYPE_TRADING_INPUT_1 = -20; + public const SOURCE_TYPE_TRADING_INPUT_2 = -21; + public const SOURCE_TYPE_TRADING_USE_INPUTS = -22; + public const SOURCE_TYPE_TRADING_OUTPUT = -23; - const SOURCE_TYPE_BEACON = -24; + public const SOURCE_TYPE_BEACON = -24; /** Any client-side window dropping its contents when the player closes it */ - const SOURCE_TYPE_CONTAINER_DROP_CONTENTS = -100; + public const SOURCE_TYPE_CONTAINER_DROP_CONTENTS = -100; - const ACTION_MAGIC_SLOT_CREATIVE_DELETE_ITEM = 0; - const ACTION_MAGIC_SLOT_CREATIVE_CREATE_ITEM = 1; + public const ACTION_MAGIC_SLOT_CREATIVE_DELETE_ITEM = 0; + public const ACTION_MAGIC_SLOT_CREATIVE_CREATE_ITEM = 1; - const ACTION_MAGIC_SLOT_DROP_ITEM = 0; - const ACTION_MAGIC_SLOT_PICKUP_ITEM = 1; + public const ACTION_MAGIC_SLOT_DROP_ITEM = 0; + public const ACTION_MAGIC_SLOT_PICKUP_ITEM = 1; /** @var int */ public $sourceType; diff --git a/src/pocketmine/network/mcpe/protocol/types/PlayerPermissions.php b/src/pocketmine/network/mcpe/protocol/types/PlayerPermissions.php index 47b27d2dd..20f6bdc9c 100644 --- a/src/pocketmine/network/mcpe/protocol/types/PlayerPermissions.php +++ b/src/pocketmine/network/mcpe/protocol/types/PlayerPermissions.php @@ -25,9 +25,9 @@ namespace pocketmine\network\mcpe\protocol\types; interface PlayerPermissions{ - const CUSTOM = 3; - const OPERATOR = 2; - const MEMBER = 1; - const VISITOR = 0; + public const CUSTOM = 3; + public const OPERATOR = 2; + public const MEMBER = 1; + public const VISITOR = 0; } \ No newline at end of file diff --git a/src/pocketmine/network/mcpe/protocol/types/WindowTypes.php b/src/pocketmine/network/mcpe/protocol/types/WindowTypes.php index e71e9fba9..70f4cffe7 100644 --- a/src/pocketmine/network/mcpe/protocol/types/WindowTypes.php +++ b/src/pocketmine/network/mcpe/protocol/types/WindowTypes.php @@ -27,24 +27,24 @@ namespace pocketmine\network\mcpe\protocol\types; interface WindowTypes{ - const INVENTORY = -1; - const CONTAINER = 0; - const WORKBENCH = 1; - const FURNACE = 2; - const ENCHANTMENT = 3; - const BREWING_STAND = 4; - const ANVIL = 5; - const DISPENSER = 6; - const DROPPER = 7; - const HOPPER = 8; - const CAULDRON = 9; - const MINECART_CHEST = 10; - const MINECART_HOPPER = 11; - const HORSE = 12; - const BEACON = 13; - const STRUCTURE_EDITOR = 14; - const TRADING = 15; - const COMMAND_BLOCK = 16; - const JUKEBOX = 17; + public const INVENTORY = -1; + public const CONTAINER = 0; + public const WORKBENCH = 1; + public const FURNACE = 2; + public const ENCHANTMENT = 3; + public const BREWING_STAND = 4; + public const ANVIL = 5; + public const DISPENSER = 6; + public const DROPPER = 7; + public const HOPPER = 8; + public const CAULDRON = 9; + public const MINECART_CHEST = 10; + public const MINECART_HOPPER = 11; + public const HORSE = 12; + public const BEACON = 13; + public const STRUCTURE_EDITOR = 14; + public const TRADING = 15; + public const COMMAND_BLOCK = 16; + public const JUKEBOX = 17; } \ No newline at end of file diff --git a/src/pocketmine/network/query/QueryHandler.php b/src/pocketmine/network/query/QueryHandler.php index 2b68337b7..b34486817 100644 --- a/src/pocketmine/network/query/QueryHandler.php +++ b/src/pocketmine/network/query/QueryHandler.php @@ -33,8 +33,8 @@ use pocketmine\utils\Binary; class QueryHandler{ private $server, $lastToken, $token, $longData, $shortData, $timeout; - const HANDSHAKE = 9; - const STATISTICS = 0; + public const HANDSHAKE = 9; + public const STATISTICS = 0; public function __construct(){ $this->server = Server::getInstance(); diff --git a/src/pocketmine/permission/DefaultPermissions.php b/src/pocketmine/permission/DefaultPermissions.php index 85e74f06f..01dc8b4c3 100644 --- a/src/pocketmine/permission/DefaultPermissions.php +++ b/src/pocketmine/permission/DefaultPermissions.php @@ -26,7 +26,7 @@ namespace pocketmine\permission; use pocketmine\Server; abstract class DefaultPermissions{ - const ROOT = "pocketmine"; + public const ROOT = "pocketmine"; /** * @param Permission $perm diff --git a/src/pocketmine/permission/Permission.php b/src/pocketmine/permission/Permission.php index 2fb0a10a1..9b57861e1 100644 --- a/src/pocketmine/permission/Permission.php +++ b/src/pocketmine/permission/Permission.php @@ -32,10 +32,10 @@ use pocketmine\Server; * Represents a permission */ class Permission{ - const DEFAULT_OP = "op"; - const DEFAULT_NOT_OP = "notop"; - const DEFAULT_TRUE = "true"; - const DEFAULT_FALSE = "false"; + public const DEFAULT_OP = "op"; + public const DEFAULT_NOT_OP = "notop"; + public const DEFAULT_TRUE = "true"; + public const DEFAULT_FALSE = "false"; public static $DEFAULT_PERMISSION = self::DEFAULT_OP; diff --git a/src/pocketmine/plugin/PluginLoadOrder.php b/src/pocketmine/plugin/PluginLoadOrder.php index 80e94d99a..410f21d63 100644 --- a/src/pocketmine/plugin/PluginLoadOrder.php +++ b/src/pocketmine/plugin/PluginLoadOrder.php @@ -28,10 +28,10 @@ abstract class PluginLoadOrder{ /* * The plugin will be loaded at startup */ - const STARTUP = 0; + public const STARTUP = 0; /* * The plugin will be loaded after the first world has been loaded/created. */ - const POSTWORLD = 1; + public const POSTWORLD = 1; } \ No newline at end of file diff --git a/src/pocketmine/scheduler/SendUsageTask.php b/src/pocketmine/scheduler/SendUsageTask.php index 59f183117..526279c53 100644 --- a/src/pocketmine/scheduler/SendUsageTask.php +++ b/src/pocketmine/scheduler/SendUsageTask.php @@ -31,9 +31,9 @@ use pocketmine\utils\VersionString; class SendUsageTask extends AsyncTask{ - const TYPE_OPEN = 1; - const TYPE_STATUS = 2; - const TYPE_CLOSE = 3; + public const TYPE_OPEN = 1; + public const TYPE_STATUS = 2; + public const TYPE_CLOSE = 3; public $endpoint; public $data; diff --git a/src/pocketmine/tile/Banner.php b/src/pocketmine/tile/Banner.php index 6f066177a..3db9b3c12 100644 --- a/src/pocketmine/tile/Banner.php +++ b/src/pocketmine/tile/Banner.php @@ -35,66 +35,66 @@ use pocketmine\Player; class Banner extends Spawnable implements Nameable{ use NameableTrait; - const TAG_BASE = "Base"; - const TAG_PATTERNS = "Patterns"; - const TAG_PATTERN_COLOR = "Color"; - const TAG_PATTERN_NAME = "Pattern"; + public const TAG_BASE = "Base"; + public const TAG_PATTERNS = "Patterns"; + public const TAG_PATTERN_COLOR = "Color"; + public const TAG_PATTERN_NAME = "Pattern"; - const PATTERN_BOTTOM_STRIPE = "bs"; - const PATTERN_TOP_STRIPE = "ts"; - const PATTERN_LEFT_STRIPE = "ls"; - const PATTERN_RIGHT_STRIPE = "rs"; - const PATTERN_CENTER_STRIPE = "cs"; - const PATTERN_MIDDLE_STRIPE = "ms"; - const PATTERN_DOWN_RIGHT_STRIPE = "drs"; - const PATTERN_DOWN_LEFT_STRIPE = "dls"; - const PATTERN_SMALL_STRIPES = "ss"; - const PATTERN_DIAGONAL_CROSS = "cr"; - const PATTERN_SQUARE_CROSS = "sc"; - const PATTERN_LEFT_OF_DIAGONAL = "ld"; - const PATTERN_RIGHT_OF_UPSIDE_DOWN_DIAGONAL = "rud"; - const PATTERN_LEFT_OF_UPSIDE_DOWN_DIAGONAL = "lud"; - const PATTERN_RIGHT_OF_DIAGONAL = "rd"; - const PATTERN_VERTICAL_HALF_LEFT = "vh"; - const PATTERN_VERTICAL_HALF_RIGHT = "vhr"; - const PATTERN_HORIZONTAL_HALF_TOP = "hh"; - const PATTERN_HORIZONTAL_HALF_BOTTOM = "hhb"; - const PATTERN_BOTTOM_LEFT_CORNER = "bl"; - const PATTERN_BOTTOM_RIGHT_CORNER = "br"; - const PATTERN_TOP_LEFT_CORNER = "tl"; - const PATTERN_TOP_RIGHT_CORNER = "tr"; - const PATTERN_BOTTOM_TRIANGLE = "bt"; - const PATTERN_TOP_TRIANGLE = "tt"; - const PATTERN_BOTTOM_TRIANGLE_SAWTOOTH = "bts"; - const PATTERN_TOP_TRIANGLE_SAWTOOTH = "tts"; - const PATTERN_MIDDLE_CIRCLE = "mc"; - const PATTERN_MIDDLE_RHOMBUS = "mr"; - const PATTERN_BORDER = "bo"; - const PATTERN_CURLY_BORDER = "cbo"; - const PATTERN_BRICK = "bri"; - const PATTERN_GRADIENT = "gra"; - const PATTERN_GRADIENT_UPSIDE_DOWN = "gru"; - const PATTERN_CREEPER = "cre"; - const PATTERN_SKULL = "sku"; - const PATTERN_FLOWER = "flo"; - const PATTERN_MOJANG = "moj"; + public const PATTERN_BOTTOM_STRIPE = "bs"; + public const PATTERN_TOP_STRIPE = "ts"; + public const PATTERN_LEFT_STRIPE = "ls"; + public const PATTERN_RIGHT_STRIPE = "rs"; + public const PATTERN_CENTER_STRIPE = "cs"; + public const PATTERN_MIDDLE_STRIPE = "ms"; + public const PATTERN_DOWN_RIGHT_STRIPE = "drs"; + public const PATTERN_DOWN_LEFT_STRIPE = "dls"; + public const PATTERN_SMALL_STRIPES = "ss"; + public const PATTERN_DIAGONAL_CROSS = "cr"; + public const PATTERN_SQUARE_CROSS = "sc"; + public const PATTERN_LEFT_OF_DIAGONAL = "ld"; + public const PATTERN_RIGHT_OF_UPSIDE_DOWN_DIAGONAL = "rud"; + public const PATTERN_LEFT_OF_UPSIDE_DOWN_DIAGONAL = "lud"; + public const PATTERN_RIGHT_OF_DIAGONAL = "rd"; + public const PATTERN_VERTICAL_HALF_LEFT = "vh"; + public const PATTERN_VERTICAL_HALF_RIGHT = "vhr"; + public const PATTERN_HORIZONTAL_HALF_TOP = "hh"; + public const PATTERN_HORIZONTAL_HALF_BOTTOM = "hhb"; + public const PATTERN_BOTTOM_LEFT_CORNER = "bl"; + public const PATTERN_BOTTOM_RIGHT_CORNER = "br"; + public const PATTERN_TOP_LEFT_CORNER = "tl"; + public const PATTERN_TOP_RIGHT_CORNER = "tr"; + public const PATTERN_BOTTOM_TRIANGLE = "bt"; + public const PATTERN_TOP_TRIANGLE = "tt"; + public const PATTERN_BOTTOM_TRIANGLE_SAWTOOTH = "bts"; + public const PATTERN_TOP_TRIANGLE_SAWTOOTH = "tts"; + public const PATTERN_MIDDLE_CIRCLE = "mc"; + public const PATTERN_MIDDLE_RHOMBUS = "mr"; + public const PATTERN_BORDER = "bo"; + public const PATTERN_CURLY_BORDER = "cbo"; + public const PATTERN_BRICK = "bri"; + public const PATTERN_GRADIENT = "gra"; + public const PATTERN_GRADIENT_UPSIDE_DOWN = "gru"; + public const PATTERN_CREEPER = "cre"; + public const PATTERN_SKULL = "sku"; + public const PATTERN_FLOWER = "flo"; + public const PATTERN_MOJANG = "moj"; - const COLOR_BLACK = 0; - const COLOR_RED = 1; - const COLOR_GREEN = 2; - const COLOR_BROWN = 3; - const COLOR_BLUE = 4; - const COLOR_PURPLE = 5; - const COLOR_CYAN = 6; - const COLOR_LIGHT_GRAY = 7; - const COLOR_GRAY = 8; - const COLOR_PINK = 9; - const COLOR_LIME = 10; - const COLOR_YELLOW = 11; - const COLOR_LIGHT_BLUE = 12; - const COLOR_MAGENTA = 13; - const COLOR_ORANGE = 14; - const COLOR_WHITE = 15; + public const COLOR_BLACK = 0; + public const COLOR_RED = 1; + public const COLOR_GREEN = 2; + public const COLOR_BROWN = 3; + public const COLOR_BLUE = 4; + public const COLOR_PURPLE = 5; + public const COLOR_CYAN = 6; + public const COLOR_LIGHT_GRAY = 7; + public const COLOR_GRAY = 8; + public const COLOR_PINK = 9; + public const COLOR_LIME = 10; + public const COLOR_YELLOW = 11; + public const COLOR_LIGHT_BLUE = 12; + public const COLOR_MAGENTA = 13; + public const COLOR_ORANGE = 14; + public const COLOR_WHITE = 15; public function __construct(Level $level, CompoundTag $nbt){ if(!$nbt->hasTag(self::TAG_BASE, IntTag::class)){ diff --git a/src/pocketmine/tile/Bed.php b/src/pocketmine/tile/Bed.php index 6c241f9b9..dade69d08 100644 --- a/src/pocketmine/tile/Bed.php +++ b/src/pocketmine/tile/Bed.php @@ -32,7 +32,7 @@ use pocketmine\nbt\tag\CompoundTag; use pocketmine\Player; class Bed extends Spawnable{ - const TAG_COLOR = "color"; + public const TAG_COLOR = "color"; public function __construct(Level $level, CompoundTag $nbt){ if(!$nbt->hasTag(self::TAG_COLOR, ByteTag::class)){ //TODO: check PC format diff --git a/src/pocketmine/tile/Chest.php b/src/pocketmine/tile/Chest.php index 8f2a01a3b..dc3d639cf 100644 --- a/src/pocketmine/tile/Chest.php +++ b/src/pocketmine/tile/Chest.php @@ -37,9 +37,9 @@ use pocketmine\Player; class Chest extends Spawnable implements InventoryHolder, Container, Nameable{ use NameableTrait, ContainerTrait; - const TAG_PAIRX = "pairx"; - const TAG_PAIRZ = "pairz"; - const TAG_PAIR_LEAD = "pairlead"; + public const TAG_PAIRX = "pairx"; + public const TAG_PAIRZ = "pairz"; + public const TAG_PAIR_LEAD = "pairlead"; /** @var ChestInventory */ protected $inventory; diff --git a/src/pocketmine/tile/Container.php b/src/pocketmine/tile/Container.php index a349824f5..f2c72a08b 100644 --- a/src/pocketmine/tile/Container.php +++ b/src/pocketmine/tile/Container.php @@ -27,7 +27,7 @@ use pocketmine\inventory\Inventory; use pocketmine\item\Item; interface Container{ - const TAG_ITEMS = "Items"; + public const TAG_ITEMS = "Items"; /** * @param int $index diff --git a/src/pocketmine/tile/FlowerPot.php b/src/pocketmine/tile/FlowerPot.php index 7dc3fad36..b91af1b97 100644 --- a/src/pocketmine/tile/FlowerPot.php +++ b/src/pocketmine/tile/FlowerPot.php @@ -33,8 +33,8 @@ use pocketmine\nbt\tag\ShortTag; use pocketmine\Player; class FlowerPot extends Spawnable{ - const TAG_ITEM = "item"; - const TAG_ITEM_DATA = "mData"; + public const TAG_ITEM = "item"; + public const TAG_ITEM_DATA = "mData"; public function __construct(Level $level, CompoundTag $nbt){ //TODO: check PC format diff --git a/src/pocketmine/tile/Furnace.php b/src/pocketmine/tile/Furnace.php index a0f9a1b73..8cbd0fbb5 100644 --- a/src/pocketmine/tile/Furnace.php +++ b/src/pocketmine/tile/Furnace.php @@ -44,10 +44,10 @@ use pocketmine\Player; class Furnace extends Spawnable implements InventoryHolder, Container, Nameable{ use NameableTrait, ContainerTrait; - const TAG_BURN_TIME = "BurnTime"; - const TAG_COOK_TIME = "CookTime"; - const TAG_MAX_TIME = "MaxTime"; - const TAG_BURN_TICKS = "BurnTicks"; + public const TAG_BURN_TIME = "BurnTime"; + public const TAG_COOK_TIME = "CookTime"; + public const TAG_MAX_TIME = "MaxTime"; + public const TAG_BURN_TICKS = "BurnTicks"; /** @var FurnaceInventory */ protected $inventory; diff --git a/src/pocketmine/tile/ItemFrame.php b/src/pocketmine/tile/ItemFrame.php index 6bf003e7c..db1439607 100644 --- a/src/pocketmine/tile/ItemFrame.php +++ b/src/pocketmine/tile/ItemFrame.php @@ -33,9 +33,9 @@ use pocketmine\nbt\tag\FloatTag; use pocketmine\Player; class ItemFrame extends Spawnable{ - const TAG_ITEM_ROTATION = "ItemRotation"; - const TAG_ITEM_DROP_CHANCE = "ItemDropChance"; - const TAG_ITEM = "Item"; + public const TAG_ITEM_ROTATION = "ItemRotation"; + public const TAG_ITEM_DROP_CHANCE = "ItemDropChance"; + public const TAG_ITEM = "Item"; public function __construct(Level $level, CompoundTag $nbt){ if(!$nbt->hasTag(self::TAG_ITEM_ROTATION, ByteTag::class)){ diff --git a/src/pocketmine/tile/Sign.php b/src/pocketmine/tile/Sign.php index 2a9afcdff..678a3d5da 100644 --- a/src/pocketmine/tile/Sign.php +++ b/src/pocketmine/tile/Sign.php @@ -33,9 +33,9 @@ use pocketmine\Player; use pocketmine\utils\TextFormat; class Sign extends Spawnable{ - const TAG_TEXT_BLOB = "Text"; - const TAG_TEXT_LINE = "Text%d"; //sprintf()able - const TAG_CREATOR = "Creator"; + public const TAG_TEXT_BLOB = "Text"; + public const TAG_TEXT_LINE = "Text%d"; //sprintf()able + public const TAG_CREATOR = "Creator"; /** @var string[] */ protected $text = ["", "", "", ""]; diff --git a/src/pocketmine/tile/Skull.php b/src/pocketmine/tile/Skull.php index 891b8cbb3..6fb02425d 100644 --- a/src/pocketmine/tile/Skull.php +++ b/src/pocketmine/tile/Skull.php @@ -31,17 +31,17 @@ use pocketmine\nbt\tag\CompoundTag; use pocketmine\Player; class Skull extends Spawnable{ - const TYPE_SKELETON = 0; - const TYPE_WITHER = 1; - const TYPE_ZOMBIE = 2; - const TYPE_HUMAN = 3; - const TYPE_CREEPER = 4; - const TYPE_DRAGON = 5; + public const TYPE_SKELETON = 0; + public const TYPE_WITHER = 1; + public const TYPE_ZOMBIE = 2; + public const TYPE_HUMAN = 3; + public const TYPE_CREEPER = 4; + public const TYPE_DRAGON = 5; - const TAG_SKULL_TYPE = "SkullType"; //TAG_Byte - const TAG_ROT = "Rot"; //TAG_Byte - const TAG_MOUTH_MOVING = "MouthMoving"; //TAG_Byte - const TAG_MOUTH_TICK_COUNT = "MouthTickCount"; //TAG_Int + public const TAG_SKULL_TYPE = "SkullType"; //TAG_Byte + public const TAG_ROT = "Rot"; //TAG_Byte + public const TAG_MOUTH_MOVING = "MouthMoving"; //TAG_Byte + public const TAG_MOUTH_TICK_COUNT = "MouthTickCount"; //TAG_Int public function __construct(Level $level, CompoundTag $nbt){ if(!$nbt->hasTag(self::TAG_SKULL_TYPE, ByteTag::class)){ diff --git a/src/pocketmine/tile/Tile.php b/src/pocketmine/tile/Tile.php index 5978141a1..57bdbf186 100644 --- a/src/pocketmine/tile/Tile.php +++ b/src/pocketmine/tile/Tile.php @@ -44,22 +44,22 @@ use pocketmine\Server; abstract class Tile extends Position{ - const TAG_ID = "id"; - const TAG_X = "x"; - const TAG_Y = "y"; - const TAG_Z = "z"; + public const TAG_ID = "id"; + public const TAG_X = "x"; + public const TAG_Y = "y"; + public const TAG_Z = "z"; - const BREWING_STAND = "BrewingStand"; - const CHEST = "Chest"; - const ENCHANT_TABLE = "EnchantTable"; - const FLOWER_POT = "FlowerPot"; - const FURNACE = "Furnace"; - const ITEM_FRAME = "ItemFrame"; - const MOB_SPAWNER = "MobSpawner"; - const SIGN = "Sign"; - const SKULL = "Skull"; - const BED = "Bed"; - const BANNER = "Banner"; + public const BREWING_STAND = "BrewingStand"; + public const CHEST = "Chest"; + public const ENCHANT_TABLE = "EnchantTable"; + public const FLOWER_POT = "FlowerPot"; + public const FURNACE = "Furnace"; + public const ITEM_FRAME = "ItemFrame"; + public const MOB_SPAWNER = "MobSpawner"; + public const SIGN = "Sign"; + public const SKULL = "Skull"; + public const BED = "Bed"; + public const BANNER = "Banner"; /** @var int */ public static $tileCount = 1; diff --git a/src/pocketmine/utils/Binary.php b/src/pocketmine/utils/Binary.php index ada1ac1b6..57e58afda 100644 --- a/src/pocketmine/utils/Binary.php +++ b/src/pocketmine/utils/Binary.php @@ -28,8 +28,8 @@ namespace pocketmine\utils; class Binary{ - const BIG_ENDIAN = 0x00; - const LITTLE_ENDIAN = 0x01; + public const BIG_ENDIAN = 0x00; + public const LITTLE_ENDIAN = 0x01; public static function signByte(int $value) : int{ return $value << 56 >> 56; diff --git a/src/pocketmine/utils/Config.php b/src/pocketmine/utils/Config.php index 779d40d72..c44172988 100644 --- a/src/pocketmine/utils/Config.php +++ b/src/pocketmine/utils/Config.php @@ -31,15 +31,15 @@ use pocketmine\Server; * Config Class for simple config manipulation of multiple formats. */ class Config{ - const DETECT = -1; //Detect by file extension - const PROPERTIES = 0; // .properties - const CNF = Config::PROPERTIES; // .cnf - const JSON = 1; // .js, .json - const YAML = 2; // .yml, .yaml + public const DETECT = -1; //Detect by file extension + public const PROPERTIES = 0; // .properties + public const CNF = Config::PROPERTIES; // .cnf + public const JSON = 1; // .js, .json + public const YAML = 2; // .yml, .yaml //const EXPORT = 3; // .export, .xport - const SERIALIZED = 4; // .sl - const ENUM = 5; // .txt, .list, .enum - const ENUMERATION = Config::ENUM; + public const SERIALIZED = 4; // .sl + public const ENUM = 5; // .txt, .list, .enum + public const ENUMERATION = Config::ENUM; /** @var array */ private $config = []; diff --git a/src/pocketmine/utils/Random.php b/src/pocketmine/utils/Random.php index f7994bd34..8b863121a 100644 --- a/src/pocketmine/utils/Random.php +++ b/src/pocketmine/utils/Random.php @@ -28,10 +28,10 @@ namespace pocketmine\utils; * Most of the code in this class was adapted from the XorShift128Engine in the php-random library. */ class Random{ - const X = 123456789; - const Y = 362436069; - const Z = 521288629; - const W = 88675123; + public const X = 123456789; + public const Y = 362436069; + public const Z = 521288629; + public const W = 88675123; /** * @var int diff --git a/src/pocketmine/utils/TextFormat.php b/src/pocketmine/utils/TextFormat.php index 34e1be68a..804a18067 100644 --- a/src/pocketmine/utils/TextFormat.php +++ b/src/pocketmine/utils/TextFormat.php @@ -27,31 +27,31 @@ namespace pocketmine\utils; * Class used to handle Minecraft chat format, and convert it to other formats like ANSI or HTML */ abstract class TextFormat{ - const ESCAPE = "\xc2\xa7"; //§ + public const ESCAPE = "\xc2\xa7"; //§ - const BLACK = TextFormat::ESCAPE . "0"; - const DARK_BLUE = TextFormat::ESCAPE . "1"; - const DARK_GREEN = TextFormat::ESCAPE . "2"; - const DARK_AQUA = TextFormat::ESCAPE . "3"; - const DARK_RED = TextFormat::ESCAPE . "4"; - const DARK_PURPLE = TextFormat::ESCAPE . "5"; - const GOLD = TextFormat::ESCAPE . "6"; - const GRAY = TextFormat::ESCAPE . "7"; - const DARK_GRAY = TextFormat::ESCAPE . "8"; - const BLUE = TextFormat::ESCAPE . "9"; - const GREEN = TextFormat::ESCAPE . "a"; - const AQUA = TextFormat::ESCAPE . "b"; - const RED = TextFormat::ESCAPE . "c"; - const LIGHT_PURPLE = TextFormat::ESCAPE . "d"; - const YELLOW = TextFormat::ESCAPE . "e"; - const WHITE = TextFormat::ESCAPE . "f"; + public const BLACK = TextFormat::ESCAPE . "0"; + public const DARK_BLUE = TextFormat::ESCAPE . "1"; + public const DARK_GREEN = TextFormat::ESCAPE . "2"; + public const DARK_AQUA = TextFormat::ESCAPE . "3"; + public const DARK_RED = TextFormat::ESCAPE . "4"; + public const DARK_PURPLE = TextFormat::ESCAPE . "5"; + public const GOLD = TextFormat::ESCAPE . "6"; + public const GRAY = TextFormat::ESCAPE . "7"; + public const DARK_GRAY = TextFormat::ESCAPE . "8"; + public const BLUE = TextFormat::ESCAPE . "9"; + public const GREEN = TextFormat::ESCAPE . "a"; + public const AQUA = TextFormat::ESCAPE . "b"; + public const RED = TextFormat::ESCAPE . "c"; + public const LIGHT_PURPLE = TextFormat::ESCAPE . "d"; + public const YELLOW = TextFormat::ESCAPE . "e"; + public const WHITE = TextFormat::ESCAPE . "f"; - const OBFUSCATED = TextFormat::ESCAPE . "k"; - const BOLD = TextFormat::ESCAPE . "l"; - const STRIKETHROUGH = TextFormat::ESCAPE . "m"; - const UNDERLINE = TextFormat::ESCAPE . "n"; - const ITALIC = TextFormat::ESCAPE . "o"; - const RESET = TextFormat::ESCAPE . "r"; + public const OBFUSCATED = TextFormat::ESCAPE . "k"; + public const BOLD = TextFormat::ESCAPE . "l"; + public const STRIKETHROUGH = TextFormat::ESCAPE . "m"; + public const UNDERLINE = TextFormat::ESCAPE . "n"; + public const ITALIC = TextFormat::ESCAPE . "o"; + public const RESET = TextFormat::ESCAPE . "r"; /** * Splits the string by Format tokens diff --git a/src/pocketmine/wizard/SetupWizard.php b/src/pocketmine/wizard/SetupWizard.php index cb8de631d..e4ed09d19 100644 --- a/src/pocketmine/wizard/SetupWizard.php +++ b/src/pocketmine/wizard/SetupWizard.php @@ -32,11 +32,11 @@ use pocketmine\utils\Config; use pocketmine\utils\Utils; class SetupWizard{ - const DEFAULT_NAME = \pocketmine\NAME . " Server"; - const DEFAULT_PORT = 19132; - const DEFAULT_MEMORY = 256; - const DEFAULT_PLAYERS = 20; - const DEFAULT_GAMEMODE = 0; + public const DEFAULT_NAME = \pocketmine\NAME . " Server"; + public const DEFAULT_PORT = 19132; + public const DEFAULT_MEMORY = 256; + public const DEFAULT_PLAYERS = 20; + public const DEFAULT_GAMEMODE = 0; /** @var BaseLang */ private $lang;