Merge branch 'master' into mcpe-1.2.5

This commit is contained in:
Dylan K. Taylor
2017-11-21 16:48:18 +00:00
235 changed files with 5493 additions and 2406 deletions

View File

@ -31,45 +31,45 @@ use pocketmine\network\mcpe\protocol\types\CommandEnum;
use pocketmine\network\mcpe\protocol\types\CommandParameter;
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 <level: int>L.
*/
const ARG_FLAG_POSTFIX = 0x1000000;
public const ARG_FLAG_POSTFIX = 0x1000000;
/**
* @var string[]