mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-05-14 01:39:52 +00:00
Code Issues Projects Releases Wiki Activity

MCPE protocol gets its own namespace

Browse Source
This commit is contained in:
Dylan K. Taylor 2017-02-26 16:21:01 +00:00
parent 477cb77002
commit 56990eb28b
132 changed files with 600 additions and 601 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/pocketmine/CrashDump.php
View File

@ -21,7 +21,7 @@
namespace pocketmine; namespace pocketmine;
use pocketmine\network\protocol\Info; use pocketmine\network\mcpe\protocol\ProtocolInfo;
use pocketmine\plugin\PluginBase; use pocketmine\plugin\PluginBase;
use pocketmine\plugin\PluginLoadOrder; use pocketmine\plugin\PluginLoadOrder;
use pocketmine\utils\Utils; use pocketmine\utils\Utils;
@ -226,7 +226,7 @@ class CrashDump{
$this->data["general"] = []; $this->data["general"] = [];
$this->data["general"]["version"] = $version->get(false); $this->data["general"]["version"] = $version->get(false);
$this->data["general"]["build"] = $version->getBuild(); $this->data["general"]["build"] = $version->getBuild();
$this->data["general"]["protocol"] = Info::CURRENT_PROTOCOL; $this->data["general"]["protocol"] = ProtocolInfo::CURRENT_PROTOCOL;
$this->data["general"]["api"] = \pocketmine\API_VERSION; $this->data["general"]["api"] = \pocketmine\API_VERSION;
$this->data["general"]["git"] = \pocketmine\GIT_COMMIT; $this->data["general"]["git"] = \pocketmine\GIT_COMMIT;
$this->data["general"]["raklib"] = RakLib::VERSION; $this->data["general"]["raklib"] = RakLib::VERSION;
@ -235,7 +235,7 @@ class CrashDump{
$this->data["general"]["zend"] = zend_version(); $this->data["general"]["zend"] = zend_version();
$this->data["general"]["php_os"] = PHP_OS; $this->data["general"]["php_os"] = PHP_OS;
$this->data["general"]["os"] = Utils::getOS(); $this->data["general"]["os"] = Utils::getOS();
$this->addLine("PocketMine-MP version: " . $version->get(false) . " #" . $version->getBuild() . " [Protocol " . Info::CURRENT_PROTOCOL . "; API " . API_VERSION . "]"); $this->addLine("PocketMine-MP version: " . $version->get(false) . " #" . $version->getBuild() . " [Protocol " . ProtocolInfo::CURRENT_PROTOCOL . "; API " . API_VERSION . "]");
$this->addLine("Git commit: " . GIT_COMMIT); $this->addLine("Git commit: " . GIT_COMMIT);
$this->addLine("uname -a: " . php_uname("a")); $this->addLine("uname -a: " . php_uname("a"));
$this->addLine("PHP Version: " . phpversion()); $this->addLine("PHP Version: " . phpversion());

150
src/pocketmine/Player.php
View File

@ -101,80 +101,80 @@ use pocketmine\nbt\tag\ListTag;
use pocketmine\nbt\tag\LongTag; use pocketmine\nbt\tag\LongTag;
use pocketmine\nbt\tag\ShortTag; use pocketmine\nbt\tag\ShortTag;
use pocketmine\nbt\tag\StringTag; use pocketmine\nbt\tag\StringTag;
use pocketmine\network\PocketEditionNetworkSession; use pocketmine\network\mcpe\NetworkSession;
use pocketmine\network\protocol\AddEntityPacket; use pocketmine\network\mcpe\protocol\AddEntityPacket;
use pocketmine\network\protocol\AddHangingEntityPacket; use pocketmine\network\mcpe\protocol\AddHangingEntityPacket;
use pocketmine\network\protocol\AddItemEntityPacket; use pocketmine\network\mcpe\protocol\AddItemEntityPacket;
use pocketmine\network\protocol\AddItemPacket; use pocketmine\network\mcpe\protocol\AddItemPacket;
use pocketmine\network\protocol\AddPaintingPacket; use pocketmine\network\mcpe\protocol\AddPaintingPacket;
use pocketmine\network\protocol\AddPlayerPacket; use pocketmine\network\mcpe\protocol\AddPlayerPacket;
use pocketmine\network\protocol\AdventureSettingsPacket; use pocketmine\network\mcpe\protocol\AdventureSettingsPacket;
use pocketmine\network\protocol\AnimatePacket; use pocketmine\network\mcpe\protocol\AnimatePacket;
use pocketmine\network\protocol\AvailableCommandsPacket; use pocketmine\network\mcpe\protocol\AvailableCommandsPacket;
use pocketmine\network\protocol\BatchPacket; use pocketmine\network\mcpe\protocol\BatchPacket;
use pocketmine\network\protocol\BlockEntityDataPacket; use pocketmine\network\mcpe\protocol\BlockEntityDataPacket;
use pocketmine\network\protocol\BlockEventPacket; use pocketmine\network\mcpe\protocol\BlockEventPacket;
use pocketmine\network\protocol\ChangeDimensionPacket; use pocketmine\network\mcpe\protocol\ChangeDimensionPacket;
use pocketmine\network\protocol\ChunkRadiusUpdatedPacket; use pocketmine\network\mcpe\protocol\ChunkRadiusUpdatedPacket;
use pocketmine\network\protocol\CommandStepPacket; use pocketmine\network\mcpe\protocol\CommandStepPacket;
use pocketmine\network\protocol\ContainerClosePacket; use pocketmine\network\mcpe\protocol\ContainerClosePacket;
use pocketmine\network\protocol\ContainerOpenPacket; use pocketmine\network\mcpe\protocol\ContainerOpenPacket;
use pocketmine\network\protocol\ContainerSetContentPacket; use pocketmine\network\mcpe\protocol\ContainerSetContentPacket;
use pocketmine\network\protocol\ContainerSetDataPacket; use pocketmine\network\mcpe\protocol\ContainerSetDataPacket;
use pocketmine\network\protocol\ContainerSetSlotPacket; use pocketmine\network\mcpe\protocol\ContainerSetSlotPacket;
use pocketmine\network\protocol\CraftingDataPacket; use pocketmine\network\mcpe\protocol\CraftingDataPacket;
use pocketmine\network\protocol\CraftingEventPacket; use pocketmine\network\mcpe\protocol\CraftingEventPacket;
use pocketmine\network\protocol\DataPacket; use pocketmine\network\mcpe\protocol\DataPacket;
use pocketmine\network\protocol\DisconnectPacket; use pocketmine\network\mcpe\protocol\DisconnectPacket;
use pocketmine\network\protocol\DropItemPacket; use pocketmine\network\mcpe\protocol\DropItemPacket;
use pocketmine\network\protocol\EntityEventPacket; use pocketmine\network\mcpe\protocol\EntityEventPacket;
use pocketmine\network\protocol\ExplodePacket; use pocketmine\network\mcpe\protocol\ExplodePacket;
use pocketmine\network\protocol\FullChunkDataPacket; use pocketmine\network\mcpe\protocol\FullChunkDataPacket;
use pocketmine\network\protocol\HurtArmorPacket; use pocketmine\network\mcpe\protocol\HurtArmorPacket;
use pocketmine\network\protocol\Info as ProtocolInfo; use pocketmine\network\mcpe\protocol\ProtocolInfo;
use pocketmine\network\protocol\InteractPacket; use pocketmine\network\mcpe\protocol\InteractPacket;
use pocketmine\network\protocol\InventoryActionPacket; use pocketmine\network\mcpe\protocol\InventoryActionPacket;
use pocketmine\network\protocol\ItemFrameDropItemPacket; use pocketmine\network\mcpe\protocol\ItemFrameDropItemPacket;
use pocketmine\network\protocol\LevelEventPacket; use pocketmine\network\mcpe\protocol\LevelEventPacket;
use pocketmine\network\protocol\LevelSoundEventPacket; use pocketmine\network\mcpe\protocol\LevelSoundEventPacket;
use pocketmine\network\protocol\LoginPacket; use pocketmine\network\mcpe\protocol\LoginPacket;
use pocketmine\network\protocol\MobArmorEquipmentPacket; use pocketmine\network\mcpe\protocol\MobArmorEquipmentPacket;
use pocketmine\network\protocol\MobEffectPacket; use pocketmine\network\mcpe\protocol\MobEffectPacket;
use pocketmine\network\protocol\MobEquipmentPacket; use pocketmine\network\mcpe\protocol\MobEquipmentPacket;
use pocketmine\network\protocol\MoveEntityPacket; use pocketmine\network\mcpe\protocol\MoveEntityPacket;
use pocketmine\network\protocol\MovePlayerPacket; use pocketmine\network\mcpe\protocol\MovePlayerPacket;
use pocketmine\network\protocol\PlayerActionPacket; use pocketmine\network\mcpe\protocol\PlayerActionPacket;
use pocketmine\network\protocol\PlayerFallPacket; use pocketmine\network\mcpe\protocol\PlayerFallPacket;
use pocketmine\network\protocol\PlayerInputPacket; use pocketmine\network\mcpe\protocol\PlayerInputPacket;
use pocketmine\network\protocol\PlayerListPacket; use pocketmine\network\mcpe\protocol\PlayerListPacket;
use pocketmine\network\protocol\PlayStatusPacket; use pocketmine\network\mcpe\protocol\PlayStatusPacket;
use pocketmine\network\protocol\RemoveBlockPacket; use pocketmine\network\mcpe\protocol\RemoveBlockPacket;
use pocketmine\network\protocol\RemoveEntityPacket; use pocketmine\network\mcpe\protocol\RemoveEntityPacket;
use pocketmine\network\protocol\ReplaceItemInSlotPacket; use pocketmine\network\mcpe\protocol\ReplaceItemInSlotPacket;
use pocketmine\network\protocol\RequestChunkRadiusPacket; use pocketmine\network\mcpe\protocol\RequestChunkRadiusPacket;
use pocketmine\network\protocol\ResourcePackClientResponsePacket; use pocketmine\network\mcpe\protocol\ResourcePackClientResponsePacket;
use pocketmine\network\protocol\ResourcePacksInfoPacket; use pocketmine\network\mcpe\protocol\ResourcePacksInfoPacket;
use pocketmine\network\protocol\ResourcePackStackPacket; use pocketmine\network\mcpe\protocol\ResourcePackStackPacket;
use pocketmine\network\protocol\RespawnPacket; use pocketmine\network\mcpe\protocol\RespawnPacket;
use pocketmine\network\protocol\RiderJumpPacket; use pocketmine\network\mcpe\protocol\RiderJumpPacket;
use pocketmine\network\protocol\SetCommandsEnabledPacket; use pocketmine\network\mcpe\protocol\SetCommandsEnabledPacket;
use pocketmine\network\protocol\SetDifficultyPacket; use pocketmine\network\mcpe\protocol\SetDifficultyPacket;
use pocketmine\network\protocol\SetEntityDataPacket; use pocketmine\network\mcpe\protocol\SetEntityDataPacket;
use pocketmine\network\protocol\SetEntityLinkPacket; use pocketmine\network\mcpe\protocol\SetEntityLinkPacket;
use pocketmine\network\protocol\SetEntityMotionPacket; use pocketmine\network\mcpe\protocol\SetEntityMotionPacket;
use pocketmine\network\protocol\SetHealthPacket; use pocketmine\network\mcpe\protocol\SetHealthPacket;
use pocketmine\network\protocol\SetPlayerGameTypePacket; use pocketmine\network\mcpe\protocol\SetPlayerGameTypePacket;
use pocketmine\network\protocol\SetSpawnPositionPacket; use pocketmine\network\mcpe\protocol\SetSpawnPositionPacket;
use pocketmine\network\protocol\SetTimePacket; use pocketmine\network\mcpe\protocol\SetTimePacket;
use pocketmine\network\protocol\ShowCreditsPacket; use pocketmine\network\mcpe\protocol\ShowCreditsPacket;
use pocketmine\network\protocol\SpawnExperienceOrbPacket; use pocketmine\network\mcpe\protocol\SpawnExperienceOrbPacket;
use pocketmine\network\protocol\StartGamePacket; use pocketmine\network\mcpe\protocol\StartGamePacket;
use pocketmine\network\protocol\TakeItemEntityPacket; use pocketmine\network\mcpe\protocol\TakeItemEntityPacket;
use pocketmine\network\protocol\TextPacket; use pocketmine\network\mcpe\protocol\TextPacket;
use pocketmine\network\protocol\TransferPacket; use pocketmine\network\mcpe\protocol\TransferPacket;
use pocketmine\network\protocol\UpdateAttributesPacket; use pocketmine\network\mcpe\protocol\UpdateAttributesPacket;
use pocketmine\network\protocol\UpdateBlockPacket; use pocketmine\network\mcpe\protocol\UpdateBlockPacket;
use pocketmine\network\protocol\UseItemPacket; use pocketmine\network\mcpe\protocol\UseItemPacket;
use pocketmine\network\SourceInterface; use pocketmine\network\SourceInterface;
use pocketmine\permission\PermissibleBase; use pocketmine\permission\PermissibleBase;
use pocketmine\permission\PermissionAttachment; use pocketmine\permission\PermissionAttachment;
@ -188,7 +188,7 @@ use pocketmine\utils\UUID;
/** /**
* Main class that handles networking, recovery, and packet sending to the server part * Main class that handles networking, recovery, and packet sending to the server part
*/ */
class Player extends Human implements CommandSender, InventoryHolder, ChunkLoader, IPlayer, PocketEditionNetworkSession{ class Player extends Human implements CommandSender, InventoryHolder, ChunkLoader, IPlayer, NetworkSession{
const SURVIVAL = 0; const SURVIVAL = 0;
const CREATIVE = 1; const CREATIVE = 1;

12
src/pocketmine/Server.php
View File

@ -48,8 +48,8 @@ use pocketmine\inventory\Recipe;
use pocketmine\item\enchantment\Enchantment; use pocketmine\item\enchantment\Enchantment;
use pocketmine\item\Item; use pocketmine\item\Item;
use pocketmine\lang\BaseLang; use pocketmine\lang\BaseLang;
use pocketmine\level\format\io\LevelProviderManager;
use pocketmine\level\format\io\leveldb\LevelDB; use pocketmine\level\format\io\leveldb\LevelDB;
use pocketmine\level\format\io\LevelProviderManager;
use pocketmine\level\format\io\region\Anvil; use pocketmine\level\format\io\region\Anvil;
use pocketmine\level\format\io\region\McRegion; use pocketmine\level\format\io\region\McRegion;
use pocketmine\level\format\io\region\PMAnvil; use pocketmine\level\format\io\region\PMAnvil;
@ -74,13 +74,13 @@ use pocketmine\nbt\tag\LongTag;
use pocketmine\nbt\tag\ShortTag; use pocketmine\nbt\tag\ShortTag;
use pocketmine\nbt\tag\StringTag; use pocketmine\nbt\tag\StringTag;
use pocketmine\network\CompressBatchedTask; use pocketmine\network\CompressBatchedTask;
use pocketmine\network\mcpe\protocol\BatchPacket;
use pocketmine\network\mcpe\protocol\DataPacket;
use pocketmine\network\mcpe\protocol\ProtocolInfo;
use pocketmine\network\mcpe\protocol\PlayerListPacket;
use pocketmine\network\mcpe\RakLibInterface;
use pocketmine\network\Network; use pocketmine\network\Network;
use pocketmine\network\protocol\BatchPacket;
use pocketmine\network\protocol\DataPacket;
use pocketmine\network\protocol\Info as ProtocolInfo;
use pocketmine\network\protocol\PlayerListPacket;
use pocketmine\network\query\QueryHandler; use pocketmine\network\query\QueryHandler;
use pocketmine\network\RakLibInterface;
use pocketmine\network\rcon\RCON; use pocketmine\network\rcon\RCON;
use pocketmine\network\upnp\UPnP; use pocketmine\network\upnp\UPnP;
use pocketmine\permission\BanList; use pocketmine\permission\BanList;

2
src/pocketmine/command/defaults/DifficultyCommand.php
View File

@ -24,7 +24,7 @@ namespace pocketmine\command\defaults;
use pocketmine\command\Command; use pocketmine\command\Command;
use pocketmine\command\CommandSender; use pocketmine\command\CommandSender;
use pocketmine\event\TranslationContainer; use pocketmine\event\TranslationContainer;
use pocketmine\network\protocol\SetDifficultyPacket; use pocketmine\network\mcpe\protocol\SetDifficultyPacket;
use pocketmine\Server; use pocketmine\Server;
class DifficultyCommand extends VanillaCommand{ class DifficultyCommand extends VanillaCommand{

4
src/pocketmine/command/defaults/VersionCommand.php
View File

@ -23,7 +23,7 @@ namespace pocketmine\command\defaults;
use pocketmine\command\CommandSender; use pocketmine\command\CommandSender;
use pocketmine\event\TranslationContainer; use pocketmine\event\TranslationContainer;
use pocketmine\network\protocol\Info; use pocketmine\network\mcpe\protocol\ProtocolInfo;
use pocketmine\plugin\Plugin; use pocketmine\plugin\Plugin;
use pocketmine\utils\TextFormat; use pocketmine\utils\TextFormat;
@ -51,7 +51,7 @@ class VersionCommand extends VanillaCommand{
$sender->getServer()->getCodename(), $sender->getServer()->getCodename(),
$sender->getServer()->getApiVersion(), $sender->getServer()->getApiVersion(),
$sender->getServer()->getVersion(), $sender->getServer()->getVersion(),
Info::CURRENT_PROTOCOL ProtocolInfo::CURRENT_PROTOCOL
])); ]));
}else{ }else{
$pluginName = implode(" ", $args); $pluginName = implode(" ", $args);

2
src/pocketmine/entity/Arrow.php
View File

@ -24,7 +24,7 @@ namespace pocketmine\entity;
use pocketmine\level\Level; use pocketmine\level\Level;
use pocketmine\level\particle\CriticalParticle; use pocketmine\level\particle\CriticalParticle;
use pocketmine\nbt\tag\CompoundTag; use pocketmine\nbt\tag\CompoundTag;
use pocketmine\network\protocol\AddEntityPacket; use pocketmine\network\mcpe\protocol\AddEntityPacket;
use pocketmine\Player; use pocketmine\Player;
class Arrow extends Projectile{ class Arrow extends Projectile{

2
src/pocketmine/entity/Effect.php
View File

@ -26,7 +26,7 @@ use pocketmine\event\entity\EntityEffectAddEvent;
use pocketmine\event\entity\EntityEffectRemoveEvent; use pocketmine\event\entity\EntityEffectRemoveEvent;
use pocketmine\event\entity\EntityRegainHealthEvent; use pocketmine\event\entity\EntityRegainHealthEvent;
use pocketmine\event\player\PlayerExhaustEvent; use pocketmine\event\player\PlayerExhaustEvent;
use pocketmine\network\protocol\MobEffectPacket; use pocketmine\network\mcpe\protocol\MobEffectPacket;
use pocketmine\Player; use pocketmine\Player;
class Effect{ class Effect{

6
src/pocketmine/entity/Entity.php
View File

@ -52,9 +52,9 @@ use pocketmine\nbt\tag\IntTag;
use pocketmine\nbt\tag\ListTag; use pocketmine\nbt\tag\ListTag;
use pocketmine\nbt\tag\ShortTag; use pocketmine\nbt\tag\ShortTag;
use pocketmine\nbt\tag\StringTag; use pocketmine\nbt\tag\StringTag;
use pocketmine\network\protocol\MobEffectPacket; use pocketmine\network\mcpe\protocol\MobEffectPacket;
use pocketmine\network\protocol\RemoveEntityPacket; use pocketmine\network\mcpe\protocol\RemoveEntityPacket;
use pocketmine\network\protocol\SetEntityDataPacket; use pocketmine\network\mcpe\protocol\SetEntityDataPacket;
use pocketmine\Player; use pocketmine\Player;
use pocketmine\plugin\Plugin; use pocketmine\plugin\Plugin;
use pocketmine\Server; use pocketmine\Server;

2
src/pocketmine/entity/FallingSand.php
View File

@ -29,7 +29,7 @@ use pocketmine\item\Item as ItemItem;
use pocketmine\math\Vector3; use pocketmine\math\Vector3;
use pocketmine\nbt\tag\ByteTag; use pocketmine\nbt\tag\ByteTag;
use pocketmine\nbt\tag\IntTag; use pocketmine\nbt\tag\IntTag;
use pocketmine\network\protocol\AddEntityPacket; use pocketmine\network\mcpe\protocol\AddEntityPacket;
use pocketmine\Player; use pocketmine\Player;
class FallingSand extends Entity{ class FallingSand extends Entity{

4
src/pocketmine/entity/Human.php
View File

@ -35,8 +35,8 @@ use pocketmine\nbt\tag\IntTag;
use pocketmine\nbt\tag\ListTag; use pocketmine\nbt\tag\ListTag;
use pocketmine\nbt\tag\ShortTag; use pocketmine\nbt\tag\ShortTag;
use pocketmine\nbt\tag\StringTag; use pocketmine\nbt\tag\StringTag;
use pocketmine\network\protocol\AddPlayerPacket; use pocketmine\network\mcpe\protocol\AddPlayerPacket;
use pocketmine\network\protocol\RemoveEntityPacket; use pocketmine\network\mcpe\protocol\RemoveEntityPacket;
use pocketmine\Player; use pocketmine\Player;
use pocketmine\utils\UUID; use pocketmine\utils\UUID;

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

@ -28,7 +28,7 @@ use pocketmine\item\Item as ItemItem;
use pocketmine\nbt\tag\CompoundTag; use pocketmine\nbt\tag\CompoundTag;
use pocketmine\nbt\tag\ShortTag; use pocketmine\nbt\tag\ShortTag;
use pocketmine\nbt\tag\StringTag; use pocketmine\nbt\tag\StringTag;
use pocketmine\network\protocol\AddItemEntityPacket; use pocketmine\network\mcpe\protocol\AddItemEntityPacket;
use pocketmine\Player; use pocketmine\Player;
class Item extends Entity{ class Item extends Entity{

2
src/pocketmine/entity/Living.php
View File

@ -31,7 +31,7 @@ use pocketmine\event\Timings;
use pocketmine\item\Item as ItemItem; use pocketmine\item\Item as ItemItem;
use pocketmine\math\Vector3; use pocketmine\math\Vector3;
use pocketmine\nbt\tag\ShortTag; use pocketmine\nbt\tag\ShortTag;
use pocketmine\network\protocol\EntityEventPacket; use pocketmine\network\mcpe\protocol\EntityEventPacket;
use pocketmine\utils\BlockIterator; use pocketmine\utils\BlockIterator;
abstract class Living extends Entity implements Damageable{ abstract class Living extends Entity implements Damageable{

2
src/pocketmine/entity/PrimedTNT.php
View File

@ -25,7 +25,7 @@ use pocketmine\event\entity\EntityDamageEvent;
use pocketmine\event\entity\ExplosionPrimeEvent; use pocketmine\event\entity\ExplosionPrimeEvent;
use pocketmine\level\Explosion; use pocketmine\level\Explosion;
use pocketmine\nbt\tag\ByteTag; use pocketmine\nbt\tag\ByteTag;
use pocketmine\network\protocol\AddEntityPacket; use pocketmine\network\mcpe\protocol\AddEntityPacket;
use pocketmine\Player; use pocketmine\Player;
class PrimedTNT extends Entity implements Explosive{ class PrimedTNT extends Entity implements Explosive{

2
src/pocketmine/entity/Snowball.php
View File

@ -23,7 +23,7 @@ namespace pocketmine\entity;
use pocketmine\level\Level; use pocketmine\level\Level;
use pocketmine\nbt\tag\CompoundTag; use pocketmine\nbt\tag\CompoundTag;
use pocketmine\network\protocol\AddEntityPacket; use pocketmine\network\mcpe\protocol\AddEntityPacket;
use pocketmine\Player; use pocketmine\Player;
class Snowball extends Projectile{ class Snowball extends Projectile{

4
src/pocketmine/entity/Squid.php
View File

@ -25,8 +25,8 @@ use pocketmine\event\entity\EntityDamageByEntityEvent;
use pocketmine\event\entity\EntityDamageEvent; use pocketmine\event\entity\EntityDamageEvent;
use pocketmine\item\Item as ItemItem; use pocketmine\item\Item as ItemItem;
use pocketmine\math\Vector3; use pocketmine\math\Vector3;
use pocketmine\network\protocol\AddEntityPacket; use pocketmine\network\mcpe\protocol\AddEntityPacket;
use pocketmine\network\protocol\EntityEventPacket; use pocketmine\network\mcpe\protocol\EntityEventPacket;
use pocketmine\Player; use pocketmine\Player;
class Squid extends WaterAnimal implements Ageable{ class Squid extends WaterAnimal implements Ageable{

2
src/pocketmine/entity/Villager.php
View File

@ -22,7 +22,7 @@
namespace pocketmine\entity; namespace pocketmine\entity;
use pocketmine\nbt\tag\IntTag; use pocketmine\nbt\tag\IntTag;
use pocketmine\network\protocol\AddEntityPacket; use pocketmine\network\mcpe\protocol\AddEntityPacket;
use pocketmine\Player; use pocketmine\Player;
class Villager extends Creature implements NPC, Ageable{ class Villager extends Creature implements NPC, Ageable{

2
src/pocketmine/entity/Zombie.php
View File

@ -23,7 +23,7 @@ namespace pocketmine\entity;
use pocketmine\event\entity\EntityDamageByEntityEvent; use pocketmine\event\entity\EntityDamageByEntityEvent;
use pocketmine\item\Item as ItemItem; use pocketmine\item\Item as ItemItem;
use pocketmine\network\protocol\AddEntityPacket; use pocketmine\network\mcpe\protocol\AddEntityPacket;
use pocketmine\Player; use pocketmine\Player;
class Zombie extends Monster{ class Zombie extends Monster{

2
src/pocketmine/event/Timings.php
View File

@ -22,7 +22,7 @@
namespace pocketmine\event; namespace pocketmine\event;
use pocketmine\entity\Entity; use pocketmine\entity\Entity;
use pocketmine\network\protocol\DataPacket; use pocketmine\network\mcpe\protocol\DataPacket;
use pocketmine\Player; use pocketmine\Player;
use pocketmine\plugin\PluginManager; use pocketmine\plugin\PluginManager;
use pocketmine\scheduler\PluginTask; use pocketmine\scheduler\PluginTask;

2
src/pocketmine/event/server/DataPacketReceiveEvent.php
View File

@ -22,7 +22,7 @@
namespace pocketmine\event\server; namespace pocketmine\event\server;
use pocketmine\event\Cancellable; use pocketmine\event\Cancellable;
use pocketmine\network\protocol\DataPacket; use pocketmine\network\mcpe\protocol\DataPacket;
use pocketmine\Player; use pocketmine\Player;
class DataPacketReceiveEvent extends ServerEvent implements Cancellable{ class DataPacketReceiveEvent extends ServerEvent implements Cancellable{

2
src/pocketmine/event/server/DataPacketSendEvent.php
View File

@ -22,7 +22,7 @@
namespace pocketmine\event\server; namespace pocketmine\event\server;
use pocketmine\event\Cancellable; use pocketmine\event\Cancellable;
use pocketmine\network\protocol\DataPacket; use pocketmine\network\mcpe\protocol\DataPacket;
use pocketmine\Player; use pocketmine\Player;
class DataPacketSendEvent extends ServerEvent implements Cancellable{ class DataPacketSendEvent extends ServerEvent implements Cancellable{

4
src/pocketmine/inventory/BaseInventory.php
View File

@ -25,8 +25,8 @@ use pocketmine\entity\Entity;
use pocketmine\event\entity\EntityInventoryChangeEvent; use pocketmine\event\entity\EntityInventoryChangeEvent;
use pocketmine\event\inventory\InventoryOpenEvent; use pocketmine\event\inventory\InventoryOpenEvent;
use pocketmine\item\Item; use pocketmine\item\Item;
use pocketmine\network\protocol\ContainerSetContentPacket; use pocketmine\network\mcpe\protocol\ContainerSetContentPacket;
use pocketmine\network\protocol\ContainerSetSlotPacket; use pocketmine\network\mcpe\protocol\ContainerSetSlotPacket;
use pocketmine\Player; use pocketmine\Player;
use pocketmine\Server; use pocketmine\Server;

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

@ -22,7 +22,7 @@
namespace pocketmine\inventory; namespace pocketmine\inventory;
use pocketmine\level\Level; use pocketmine\level\Level;
use pocketmine\network\protocol\BlockEventPacket; use pocketmine\network\mcpe\protocol\BlockEventPacket;
use pocketmine\Player; use pocketmine\Player;
use pocketmine\tile\Chest; use pocketmine\tile\Chest;

4
src/pocketmine/inventory/ContainerInventory.php
View File

@ -22,8 +22,8 @@
namespace pocketmine\inventory; namespace pocketmine\inventory;
use pocketmine\math\Vector3; use pocketmine\math\Vector3;
use pocketmine\network\protocol\ContainerClosePacket; use pocketmine\network\mcpe\protocol\ContainerClosePacket;
use pocketmine\network\protocol\ContainerOpenPacket; use pocketmine\network\mcpe\protocol\ContainerOpenPacket;
use pocketmine\Player; use pocketmine\Player;
abstract class ContainerInventory extends BaseInventory{ abstract class ContainerInventory extends BaseInventory{

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

@ -23,7 +23,7 @@ namespace pocketmine\inventory;
use pocketmine\event\Timings; use pocketmine\event\Timings;
use pocketmine\item\Item; use pocketmine\item\Item;
use pocketmine\network\protocol\CraftingDataPacket; use pocketmine\network\mcpe\protocol\CraftingDataPacket;
use pocketmine\Server; use pocketmine\Server;
use pocketmine\utils\Config; use pocketmine\utils\Config;
use pocketmine\utils\MainLogger; use pocketmine\utils\MainLogger;

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

@ -23,7 +23,7 @@ namespace pocketmine\inventory;
use pocketmine\item\Item; use pocketmine\item\Item;
use pocketmine\level\Level; use pocketmine\level\Level;
use pocketmine\network\protocol\BlockEventPacket; use pocketmine\network\mcpe\protocol\BlockEventPacket;
use pocketmine\Player; use pocketmine\Player;
use pocketmine\tile\Chest; use pocketmine\tile\Chest;

8
src/pocketmine/inventory/PlayerInventory.php
View File

@ -26,10 +26,10 @@ use pocketmine\event\entity\EntityArmorChangeEvent;
use pocketmine\event\entity\EntityInventoryChangeEvent; use pocketmine\event\entity\EntityInventoryChangeEvent;
use pocketmine\event\player\PlayerItemHeldEvent; use pocketmine\event\player\PlayerItemHeldEvent;
use pocketmine\item\Item; use pocketmine\item\Item;
use pocketmine\network\protocol\ContainerSetContentPacket; use pocketmine\network\mcpe\protocol\ContainerSetContentPacket;
use pocketmine\network\protocol\ContainerSetSlotPacket; use pocketmine\network\mcpe\protocol\ContainerSetSlotPacket;
use pocketmine\network\protocol\MobArmorEquipmentPacket; use pocketmine\network\mcpe\protocol\MobArmorEquipmentPacket;
use pocketmine\network\protocol\MobEquipmentPacket; use pocketmine\network\mcpe\protocol\MobEquipmentPacket;
use pocketmine\Player; use pocketmine\Player;
use pocketmine\Server; use pocketmine\Server;

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

@ -24,7 +24,7 @@ namespace pocketmine\item;
use pocketmine\entity\Entity; use pocketmine\entity\Entity;
use pocketmine\entity\Human; use pocketmine\entity\Human;
use pocketmine\event\entity\EntityEatItemEvent; use pocketmine\event\entity\EntityEatItemEvent;
use pocketmine\network\protocol\EntityEventPacket; use pocketmine\network\mcpe\protocol\EntityEventPacket;
use pocketmine\Player; use pocketmine\Player;
abstract class Food extends Item implements FoodSource{ abstract class Food extends Item implements FoodSource{

2
src/pocketmine/level/Explosion.php
View File

@ -38,7 +38,7 @@ use pocketmine\nbt\tag\CompoundTag;
use pocketmine\nbt\tag\DoubleTag; use pocketmine\nbt\tag\DoubleTag;
use pocketmine\nbt\tag\FloatTag; use pocketmine\nbt\tag\FloatTag;
use pocketmine\nbt\tag\ListTag; use pocketmine\nbt\tag\ListTag;
use pocketmine\network\protocol\ExplodePacket; use pocketmine\network\mcpe\protocol\ExplodePacket;
use pocketmine\utils\Random; use pocketmine\utils\Random;
class Explosion{ class Explosion{

16
src/pocketmine/level/Level.php
View File

@ -90,14 +90,14 @@ use pocketmine\nbt\tag\FloatTag;
use pocketmine\nbt\tag\ListTag; use pocketmine\nbt\tag\ListTag;
use pocketmine\nbt\tag\ShortTag; use pocketmine\nbt\tag\ShortTag;
use pocketmine\nbt\tag\StringTag; use pocketmine\nbt\tag\StringTag;
use pocketmine\network\protocol\BatchPacket; use pocketmine\network\mcpe\protocol\BatchPacket;
use pocketmine\network\protocol\DataPacket; use pocketmine\network\mcpe\protocol\DataPacket;
use pocketmine\network\protocol\FullChunkDataPacket; use pocketmine\network\mcpe\protocol\FullChunkDataPacket;
use pocketmine\network\protocol\LevelEventPacket; use pocketmine\network\mcpe\protocol\LevelEventPacket;
use pocketmine\network\protocol\MoveEntityPacket; use pocketmine\network\mcpe\protocol\MoveEntityPacket;
use pocketmine\network\protocol\SetEntityMotionPacket; use pocketmine\network\mcpe\protocol\SetEntityMotionPacket;
use pocketmine\network\protocol\SetTimePacket; use pocketmine\network\mcpe\protocol\SetTimePacket;
use pocketmine\network\protocol\UpdateBlockPacket; use pocketmine\network\mcpe\protocol\UpdateBlockPacket;
use pocketmine\Player; use pocketmine\Player;
use pocketmine\plugin\Plugin; use pocketmine\plugin\Plugin;
use pocketmine\Server; use pocketmine\Server;

6
src/pocketmine/level/format/io/leveldb/LevelDB.php
View File

@ -22,18 +22,18 @@
namespace pocketmine\level\format\io\leveldb; namespace pocketmine\level\format\io\leveldb;
use pocketmine\level\format\Chunk; use pocketmine\level\format\Chunk;
use pocketmine\level\format\SubChunk;
use pocketmine\level\format\io\BaseLevelProvider; use pocketmine\level\format\io\BaseLevelProvider;
use pocketmine\level\format\io\ChunkUtils; use pocketmine\level\format\io\ChunkUtils;
use pocketmine\level\generator\Generator; use pocketmine\level\format\SubChunk;
use pocketmine\level\generator\Flat; use pocketmine\level\generator\Flat;
use pocketmine\level\generator\Generator;
use pocketmine\level\Level; use pocketmine\level\Level;
use pocketmine\level\LevelException; use pocketmine\level\LevelException;
use pocketmine\nbt\NBT; use pocketmine\nbt\NBT;
use pocketmine\nbt\tag\{ use pocketmine\nbt\tag\{
ByteTag, CompoundTag, FloatTag, IntTag, LongTag, StringTag ByteTag, CompoundTag, FloatTag, IntTag, LongTag, StringTag
}; };
use pocketmine\network\protocol\Info as ProtocolInfo; use pocketmine\network\mcpe\protocol\ProtocolInfo;
use pocketmine\utils\Binary; use pocketmine\utils\Binary;
use pocketmine\utils\MainLogger; use pocketmine\utils\MainLogger;

2
src/pocketmine/level/particle/DestroyBlockParticle.php
View File

@ -23,7 +23,7 @@ namespace pocketmine\level\particle;
use pocketmine\block\Block; use pocketmine\block\Block;
use pocketmine\math\Vector3; use pocketmine\math\Vector3;
use pocketmine\network\protocol\LevelEventPacket; use pocketmine\network\mcpe\protocol\LevelEventPacket;
class DestroyBlockParticle extends Particle{ class DestroyBlockParticle extends Particle{

4
src/pocketmine/level/particle/FloatingTextParticle.php
View File

@ -24,8 +24,8 @@ namespace pocketmine\level\particle;
use pocketmine\entity\Entity; use pocketmine\entity\Entity;
use pocketmine\entity\Item as ItemEntity; use pocketmine\entity\Item as ItemEntity;
use pocketmine\math\Vector3; use pocketmine\math\Vector3;
use pocketmine\network\protocol\AddEntityPacket; use pocketmine\network\mcpe\protocol\AddEntityPacket;
use pocketmine\network\protocol\RemoveEntityPacket; use pocketmine\network\mcpe\protocol\RemoveEntityPacket;
class FloatingTextParticle extends Particle{ class FloatingTextParticle extends Particle{
//TODO: HACK! //TODO: HACK!

2
src/pocketmine/level/particle/GenericParticle.php
View File

@ -22,7 +22,7 @@
namespace pocketmine\level\particle; namespace pocketmine\level\particle;
use pocketmine\math\Vector3; use pocketmine\math\Vector3;
use pocketmine\network\protocol\LevelEventPacket; use pocketmine\network\mcpe\protocol\LevelEventPacket;
class GenericParticle extends Particle{ class GenericParticle extends Particle{

2
src/pocketmine/level/particle/MobSpawnParticle.php
View File

@ -22,7 +22,7 @@
namespace pocketmine\level\particle; namespace pocketmine\level\particle;
use pocketmine\math\Vector3; use pocketmine\math\Vector3;
use pocketmine\network\protocol\LevelEventPacket; use pocketmine\network\mcpe\protocol\LevelEventPacket;
class MobSpawnParticle extends Particle{ class MobSpawnParticle extends Particle{

2
src/pocketmine/level/particle/Particle.php
View File

@ -22,7 +22,7 @@
namespace pocketmine\level\particle; namespace pocketmine\level\particle;
use pocketmine\math\Vector3; use pocketmine\math\Vector3;
use pocketmine\network\protocol\DataPacket; use pocketmine\network\mcpe\protocol\DataPacket;
abstract class Particle extends Vector3{ abstract class Particle extends Vector3{

2
src/pocketmine/level/sound/AnvilBreakSound.php
View File

@ -22,7 +22,7 @@
namespace pocketmine\level\sound; namespace pocketmine\level\sound;
use pocketmine\math\Vector3; use pocketmine\math\Vector3;
use pocketmine\network\protocol\LevelEventPacket; use pocketmine\network\mcpe\protocol\LevelEventPacket;
class AnvilBreakSound extends GenericSound{ class AnvilBreakSound extends GenericSound{
public function __construct(Vector3 $pos, $pitch = 0){ public function __construct(Vector3 $pos, $pitch = 0){

2
src/pocketmine/level/sound/AnvilFallSound.php
View File

@ -22,7 +22,7 @@
namespace pocketmine\level\sound; namespace pocketmine\level\sound;
use pocketmine\math\Vector3; use pocketmine\math\Vector3;
use pocketmine\network\protocol\LevelEventPacket; use pocketmine\network\mcpe\protocol\LevelEventPacket;
class AnvilFallSound extends GenericSound{ class AnvilFallSound extends GenericSound{
public function __construct(Vector3 $pos, $pitch = 0){ public function __construct(Vector3 $pos, $pitch = 0){

2
src/pocketmine/level/sound/AnvilUseSound.php
View File

@ -22,7 +22,7 @@
namespace pocketmine\level\sound; namespace pocketmine\level\sound;
use pocketmine\math\Vector3; use pocketmine\math\Vector3;
use pocketmine\network\protocol\LevelEventPacket; use pocketmine\network\mcpe\protocol\LevelEventPacket;
class AnvilUseSound extends GenericSound{ class AnvilUseSound extends GenericSound{
public function __construct(Vector3 $pos, $pitch = 0){ public function __construct(Vector3 $pos, $pitch = 0){

2
src/pocketmine/level/sound/BlazeShootSound.php
View File

@ -22,7 +22,7 @@
namespace pocketmine\level\sound; namespace pocketmine\level\sound;
use pocketmine\math\Vector3; use pocketmine\math\Vector3;
use pocketmine\network\protocol\LevelEventPacket; use pocketmine\network\mcpe\protocol\LevelEventPacket;
class BlazeShootSound extends GenericSound{ class BlazeShootSound extends GenericSound{
public function __construct(Vector3 $pos, $pitch = 0){ public function __construct(Vector3 $pos, $pitch = 0){

2
src/pocketmine/level/sound/ClickSound.php
View File

@ -22,7 +22,7 @@
namespace pocketmine\level\sound; namespace pocketmine\level\sound;
use pocketmine\math\Vector3; use pocketmine\math\Vector3;
use pocketmine\network\protocol\LevelEventPacket; use pocketmine\network\mcpe\protocol\LevelEventPacket;
class ClickSound extends GenericSound{ class ClickSound extends GenericSound{
public function __construct(Vector3 $pos, $pitch = 0){ public function __construct(Vector3 $pos, $pitch = 0){

2
src/pocketmine/level/sound/DoorBumpSound.php
View File

@ -22,7 +22,7 @@
namespace pocketmine\level\sound; namespace pocketmine\level\sound;
use pocketmine\math\Vector3; use pocketmine\math\Vector3;
use pocketmine\network\protocol\LevelEventPacket; use pocketmine\network\mcpe\protocol\LevelEventPacket;
class DoorBumpSound extends GenericSound{ class DoorBumpSound extends GenericSound{
public function __construct(Vector3 $pos, $pitch = 0){ public function __construct(Vector3 $pos, $pitch = 0){

2
src/pocketmine/level/sound/DoorCrashSound.php
View File

@ -22,7 +22,7 @@
namespace pocketmine\level\sound; namespace pocketmine\level\sound;
use pocketmine\math\Vector3; use pocketmine\math\Vector3;
use pocketmine\network\protocol\LevelEventPacket; use pocketmine\network\mcpe\protocol\LevelEventPacket;
class DoorCrashSound extends GenericSound{ class DoorCrashSound extends GenericSound{
public function __construct(Vector3 $pos, $pitch = 0){ public function __construct(Vector3 $pos, $pitch = 0){

2
src/pocketmine/level/sound/DoorSound.php
View File

@ -22,7 +22,7 @@
namespace pocketmine\level\sound; namespace pocketmine\level\sound;
use pocketmine\math\Vector3; use pocketmine\math\Vector3;
use pocketmine\network\protocol\LevelEventPacket; use pocketmine\network\mcpe\protocol\LevelEventPacket;
class DoorSound extends GenericSound{ class DoorSound extends GenericSound{
public function __construct(Vector3 $pos, $pitch = 0){ public function __construct(Vector3 $pos, $pitch = 0){

2
src/pocketmine/level/sound/EndermanTeleportSound.php
View File

@ -22,7 +22,7 @@
namespace pocketmine\level\sound; namespace pocketmine\level\sound;
use pocketmine\math\Vector3; use pocketmine\math\Vector3;
use pocketmine\network\protocol\LevelEventPacket; use pocketmine\network\mcpe\protocol\LevelEventPacket;
class EndermanTeleportSound extends GenericSound{ class EndermanTeleportSound extends GenericSound{
public function __construct(Vector3 $pos){ public function __construct(Vector3 $pos){

2
src/pocketmine/level/sound/FizzSound.php
View File

@ -22,7 +22,7 @@
namespace pocketmine\level\sound; namespace pocketmine\level\sound;
use pocketmine\math\Vector3; use pocketmine\math\Vector3;
use pocketmine\network\protocol\LevelEventPacket; use pocketmine\network\mcpe\protocol\LevelEventPacket;
class FizzSound extends GenericSound{ class FizzSound extends GenericSound{
public function __construct(Vector3 $pos, $pitch = 0){ public function __construct(Vector3 $pos, $pitch = 0){

2
src/pocketmine/level/sound/GenericSound.php
View File

@ -22,7 +22,7 @@
namespace pocketmine\level\sound; namespace pocketmine\level\sound;
use pocketmine\math\Vector3; use pocketmine\math\Vector3;
use pocketmine\network\protocol\LevelEventPacket; use pocketmine\network\mcpe\protocol\LevelEventPacket;
class GenericSound extends Sound{ class GenericSound extends Sound{

2
src/pocketmine/level/sound/GhastShootSound.php
View File

@ -22,7 +22,7 @@
namespace pocketmine\level\sound; namespace pocketmine\level\sound;
use pocketmine\math\Vector3; use pocketmine\math\Vector3;
use pocketmine\network\protocol\LevelEventPacket; use pocketmine\network\mcpe\protocol\LevelEventPacket;
class GhastShootSound extends GenericSound{ class GhastShootSound extends GenericSound{
public function __construct(Vector3 $pos, $pitch = 0){ public function __construct(Vector3 $pos, $pitch = 0){

2
src/pocketmine/level/sound/GhastSound.php
View File

@ -22,7 +22,7 @@
namespace pocketmine\level\sound; namespace pocketmine\level\sound;
use pocketmine\math\Vector3; use pocketmine\math\Vector3;
use pocketmine\network\protocol\LevelEventPacket; use pocketmine\network\mcpe\protocol\LevelEventPacket;
class GhastSound extends GenericSound{ class GhastSound extends GenericSound{
public function __construct(Vector3 $pos, $pitch = 0){ public function __construct(Vector3 $pos, $pitch = 0){

2
src/pocketmine/level/sound/LaunchSound.php
View File

@ -22,7 +22,7 @@
namespace pocketmine\level\sound; namespace pocketmine\level\sound;
use pocketmine\math\Vector3; use pocketmine\math\Vector3;
use pocketmine\network\protocol\LevelEventPacket; use pocketmine\network\mcpe\protocol\LevelEventPacket;
class LaunchSound extends GenericSound{ class LaunchSound extends GenericSound{
public function __construct(Vector3 $pos, $pitch = 0){ public function __construct(Vector3 $pos, $pitch = 0){

2
src/pocketmine/level/sound/PopSound.php
View File

@ -22,7 +22,7 @@
namespace pocketmine\level\sound; namespace pocketmine\level\sound;
use pocketmine\math\Vector3; use pocketmine\math\Vector3;
use pocketmine\network\protocol\LevelEventPacket; use pocketmine\network\mcpe\protocol\LevelEventPacket;
class PopSound extends GenericSound{ class PopSound extends GenericSound{
public function __construct(Vector3 $pos, $pitch = 0){ public function __construct(Vector3 $pos, $pitch = 0){

2
src/pocketmine/level/sound/Sound.php
View File

@ -22,7 +22,7 @@
namespace pocketmine\level\sound; namespace pocketmine\level\sound;
use pocketmine\math\Vector3; use pocketmine\math\Vector3;
use pocketmine\network\protocol\DataPacket; use pocketmine\network\mcpe\protocol\DataPacket;
abstract class Sound extends Vector3{ abstract class Sound extends Vector3{

143
src/pocketmine/network/Network.php
View File

@ -24,77 +24,76 @@
*/ */
namespace pocketmine\network; namespace pocketmine\network;
use pocketmine\network\protocol\AddEntityPacket; use pocketmine\network\mcpe\protocol\AddEntityPacket;
use pocketmine\network\protocol\AddHangingEntityPacket; use pocketmine\network\mcpe\protocol\AddHangingEntityPacket;
use pocketmine\network\protocol\AddItemEntityPacket; use pocketmine\network\mcpe\protocol\AddItemEntityPacket;
use pocketmine\network\protocol\AddItemPacket; use pocketmine\network\mcpe\protocol\AddItemPacket;
use pocketmine\network\protocol\AddPaintingPacket; use pocketmine\network\mcpe\protocol\AddPaintingPacket;
use pocketmine\network\protocol\AddPlayerPacket; use pocketmine\network\mcpe\protocol\AddPlayerPacket;
use pocketmine\network\protocol\AdventureSettingsPacket; use pocketmine\network\mcpe\protocol\AdventureSettingsPacket;
use pocketmine\network\protocol\AnimatePacket; use pocketmine\network\mcpe\protocol\AnimatePacket;
use pocketmine\network\protocol\AvailableCommandsPacket; use pocketmine\network\mcpe\protocol\AvailableCommandsPacket;
use pocketmine\network\protocol\BatchPacket; use pocketmine\network\mcpe\protocol\BatchPacket;
use pocketmine\network\protocol\BlockEntityDataPacket; use pocketmine\network\mcpe\protocol\BlockEntityDataPacket;
use pocketmine\network\protocol\BlockEventPacket; use pocketmine\network\mcpe\protocol\BlockEventPacket;
use pocketmine\network\protocol\ChangeDimensionPacket; use pocketmine\network\mcpe\protocol\ChangeDimensionPacket;
use pocketmine\network\protocol\ChunkRadiusUpdatedPacket; use pocketmine\network\mcpe\protocol\ChunkRadiusUpdatedPacket;
use pocketmine\network\protocol\CommandStepPacket; use pocketmine\network\mcpe\protocol\CommandStepPacket;
use pocketmine\network\protocol\ContainerClosePacket; use pocketmine\network\mcpe\protocol\ContainerClosePacket;
use pocketmine\network\protocol\ContainerOpenPacket; use pocketmine\network\mcpe\protocol\ContainerOpenPacket;
use pocketmine\network\protocol\ContainerSetContentPacket; use pocketmine\network\mcpe\protocol\ContainerSetContentPacket;
use pocketmine\network\protocol\ContainerSetDataPacket; use pocketmine\network\mcpe\protocol\ContainerSetDataPacket;
use pocketmine\network\protocol\ContainerSetSlotPacket; use pocketmine\network\mcpe\protocol\ContainerSetSlotPacket;
use pocketmine\network\protocol\CraftingDataPacket; use pocketmine\network\mcpe\protocol\CraftingDataPacket;
use pocketmine\network\protocol\CraftingEventPacket; use pocketmine\network\mcpe\protocol\CraftingEventPacket;
use pocketmine\network\protocol\DataPacket; use pocketmine\network\mcpe\protocol\DataPacket;
use pocketmine\network\protocol\DisconnectPacket; use pocketmine\network\mcpe\protocol\DisconnectPacket;
use pocketmine\network\protocol\DropItemPacket; use pocketmine\network\mcpe\protocol\DropItemPacket;
use pocketmine\network\protocol\EntityEventPacket; use pocketmine\network\mcpe\protocol\EntityEventPacket;
use pocketmine\network\protocol\ExplodePacket; use pocketmine\network\mcpe\protocol\ExplodePacket;
use pocketmine\network\protocol\FullChunkDataPacket; use pocketmine\network\mcpe\protocol\FullChunkDataPacket;
use pocketmine\network\protocol\HurtArmorPacket; use pocketmine\network\mcpe\protocol\HurtArmorPacket;
use pocketmine\network\protocol\Info; use pocketmine\network\mcpe\protocol\ProtocolInfo;
use pocketmine\network\protocol\Info as ProtocolInfo; use pocketmine\network\mcpe\protocol\InteractPacket;
use pocketmine\network\protocol\InteractPacket; use pocketmine\network\mcpe\protocol\InventoryActionPacket;
use pocketmine\network\protocol\InventoryActionPacket; use pocketmine\network\mcpe\protocol\ItemFrameDropItemPacket;
use pocketmine\network\protocol\ItemFrameDropItemPacket; use pocketmine\network\mcpe\protocol\LevelEventPacket;
use pocketmine\network\protocol\LevelEventPacket; use pocketmine\network\mcpe\protocol\LevelSoundEventPacket;
use pocketmine\network\protocol\LevelSoundEventPacket; use pocketmine\network\mcpe\protocol\LoginPacket;
use pocketmine\network\protocol\LoginPacket; use pocketmine\network\mcpe\protocol\MobEquipmentPacket;
use pocketmine\network\protocol\MobArmorEquipmentPacket; use pocketmine\network\mcpe\protocol\MobArmorEquipmentPacket;
use pocketmine\network\protocol\MobEquipmentPacket; use pocketmine\network\mcpe\protocol\MoveEntityPacket;
use pocketmine\network\protocol\MoveEntityPacket; use pocketmine\network\mcpe\protocol\MovePlayerPacket;
use pocketmine\network\protocol\MovePlayerPacket; use pocketmine\network\mcpe\protocol\PlayerActionPacket;
use pocketmine\network\protocol\PlayerActionPacket; use pocketmine\network\mcpe\protocol\PlayerFallPacket;
use pocketmine\network\protocol\PlayerFallPacket; use pocketmine\network\mcpe\protocol\PlayerInputPacket;
use pocketmine\network\protocol\PlayerInputPacket; use pocketmine\network\mcpe\protocol\PlayerListPacket;
use pocketmine\network\protocol\PlayerListPacket; use pocketmine\network\mcpe\protocol\PlayStatusPacket;
use pocketmine\network\protocol\PlayStatusPacket; use pocketmine\network\mcpe\protocol\RemoveBlockPacket;
use pocketmine\network\protocol\RemoveBlockPacket; use pocketmine\network\mcpe\protocol\RemoveEntityPacket;
use pocketmine\network\protocol\RemoveEntityPacket; use pocketmine\network\mcpe\protocol\ReplaceItemInSlotPacket;
use pocketmine\network\protocol\ReplaceItemInSlotPacket; use pocketmine\network\mcpe\protocol\RequestChunkRadiusPacket;
use pocketmine\network\protocol\RequestChunkRadiusPacket; use pocketmine\network\mcpe\protocol\ResourcePackClientResponsePacket;
use pocketmine\network\protocol\ResourcePackClientResponsePacket; use pocketmine\network\mcpe\protocol\ResourcePacksInfoPacket;
use pocketmine\network\protocol\ResourcePacksInfoPacket; use pocketmine\network\mcpe\protocol\RespawnPacket;
use pocketmine\network\protocol\RespawnPacket; use pocketmine\network\mcpe\protocol\RiderJumpPacket;
use pocketmine\network\protocol\RiderJumpPacket; use pocketmine\network\mcpe\protocol\SetCommandsEnabledPacket;
use pocketmine\network\protocol\SetCommandsEnabledPacket; use pocketmine\network\mcpe\protocol\SetDifficultyPacket;
use pocketmine\network\protocol\SetDifficultyPacket; use pocketmine\network\mcpe\protocol\SetEntityDataPacket;
use pocketmine\network\protocol\SetEntityDataPacket; use pocketmine\network\mcpe\protocol\SetEntityLinkPacket;
use pocketmine\network\protocol\SetEntityLinkPacket; use pocketmine\network\mcpe\protocol\SetEntityMotionPacket;
use pocketmine\network\protocol\SetEntityMotionPacket; use pocketmine\network\mcpe\protocol\SetHealthPacket;
use pocketmine\network\protocol\SetHealthPacket; use pocketmine\network\mcpe\protocol\SetPlayerGameTypePacket;
use pocketmine\network\protocol\SetPlayerGameTypePacket; use pocketmine\network\mcpe\protocol\SetSpawnPositionPacket;
use pocketmine\network\protocol\SetSpawnPositionPacket; use pocketmine\network\mcpe\protocol\SetTimePacket;
use pocketmine\network\protocol\SetTimePacket; use pocketmine\network\mcpe\protocol\ShowCreditsPacket;
use pocketmine\network\protocol\ShowCreditsPacket; use pocketmine\network\mcpe\protocol\SpawnExperienceOrbPacket;
use pocketmine\network\protocol\SpawnExperienceOrbPacket; use pocketmine\network\mcpe\protocol\StartGamePacket;
use pocketmine\network\protocol\StartGamePacket; use pocketmine\network\mcpe\protocol\TakeItemEntityPacket;
use pocketmine\network\protocol\TakeItemEntityPacket; use pocketmine\network\mcpe\protocol\TextPacket;
use pocketmine\network\protocol\TextPacket; use pocketmine\network\mcpe\protocol\TransferPacket;
use pocketmine\network\protocol\TransferPacket; use pocketmine\network\mcpe\protocol\UpdateBlockPacket;
use pocketmine\network\protocol\UpdateBlockPacket; use pocketmine\network\mcpe\protocol\UseItemPacket;
use pocketmine\network\protocol\UseItemPacket;
use pocketmine\Player; use pocketmine\Player;
use pocketmine\Server; use pocketmine\Server;
use pocketmine\utils\BinaryStream; use pocketmine\utils\BinaryStream;
@ -244,7 +243,7 @@ class Network{
$buf = $stream->getString(); $buf = $stream->getString();
if(($pk = $this->getPacket(ord($buf{0}))) !== null){ if(($pk = $this->getPacket(ord($buf{0}))) !== null){
if($pk::NETWORK_ID === Info::BATCH_PACKET){ if($pk::NETWORK_ID === ProtocolInfo::BATCH_PACKET){
throw new \InvalidStateException("Invalid BatchPacket inside BatchPacket"); throw new \InvalidStateException("Invalid BatchPacket inside BatchPacket");
} }

2
src/pocketmine/network/SourceInterface.php
View File

@ -24,7 +24,7 @@
*/ */
namespace pocketmine\network; namespace pocketmine\network;
use pocketmine\network\protocol\DataPacket; use pocketmine\network\mcpe\protocol\DataPacket;
use pocketmine\Player; use pocketmine\Player;
/** /**

2
src/pocketmine/network/CachedEncapsulatedPacket.php → src/pocketmine/network/mcpe/CachedEncapsulatedPacket.php
View File

@ -19,7 +19,7 @@
* *
*/ */
namespace pocketmine\network; namespace pocketmine\network\mcpe;
use raklib\protocol\EncapsulatedPacket; use raklib\protocol\EncapsulatedPacket;

146
src/pocketmine/network/PocketEditionNetworkSession.php → src/pocketmine/network/mcpe/NetworkSession.php
View File

@ -20,82 +20,82 @@
*/ */
namespace pocketmine\network; namespace pocketmine\network\mcpe;
use pocketmine\network\protocol\AddEntityPacket; use pocketmine\network\mcpe\protocol\AddEntityPacket;
use pocketmine\network\protocol\AddHangingEntityPacket; use pocketmine\network\mcpe\protocol\AddHangingEntityPacket;
use pocketmine\network\protocol\AddItemEntityPacket; use pocketmine\network\mcpe\protocol\AddItemEntityPacket;
use pocketmine\network\protocol\AddItemPacket; use pocketmine\network\mcpe\protocol\AddItemPacket;
use pocketmine\network\protocol\AddPaintingPacket; use pocketmine\network\mcpe\protocol\AddPaintingPacket;
use pocketmine\network\protocol\AddPlayerPacket; use pocketmine\network\mcpe\protocol\AddPlayerPacket;
use pocketmine\network\protocol\AdventureSettingsPacket; use pocketmine\network\mcpe\protocol\AdventureSettingsPacket;
use pocketmine\network\protocol\AnimatePacket; use pocketmine\network\mcpe\protocol\AnimatePacket;
use pocketmine\network\protocol\AvailableCommandsPacket; use pocketmine\network\mcpe\protocol\AvailableCommandsPacket;
use pocketmine\network\protocol\BatchPacket; use pocketmine\network\mcpe\protocol\BatchPacket;
use pocketmine\network\protocol\BlockEntityDataPacket; use pocketmine\network\mcpe\protocol\BlockEntityDataPacket;
use pocketmine\network\protocol\BlockEventPacket; use pocketmine\network\mcpe\protocol\BlockEventPacket;
use pocketmine\network\protocol\ChangeDimensionPacket; use pocketmine\network\mcpe\protocol\ChangeDimensionPacket;
use pocketmine\network\protocol\ChunkRadiusUpdatedPacket; use pocketmine\network\mcpe\protocol\ChunkRadiusUpdatedPacket;
use pocketmine\network\protocol\CommandStepPacket; use pocketmine\network\mcpe\protocol\CommandStepPacket;
use pocketmine\network\protocol\ContainerClosePacket; use pocketmine\network\mcpe\protocol\ContainerClosePacket;
use pocketmine\network\protocol\ContainerOpenPacket; use pocketmine\network\mcpe\protocol\ContainerOpenPacket;
use pocketmine\network\protocol\ContainerSetContentPacket; use pocketmine\network\mcpe\protocol\ContainerSetContentPacket;
use pocketmine\network\protocol\ContainerSetDataPacket; use pocketmine\network\mcpe\protocol\ContainerSetDataPacket;
use pocketmine\network\protocol\ContainerSetSlotPacket; use pocketmine\network\mcpe\protocol\ContainerSetSlotPacket;
use pocketmine\network\protocol\CraftingDataPacket; use pocketmine\network\mcpe\protocol\CraftingDataPacket;
use pocketmine\network\protocol\CraftingEventPacket; use pocketmine\network\mcpe\protocol\CraftingEventPacket;
use pocketmine\network\protocol\DisconnectPacket; use pocketmine\network\mcpe\protocol\DisconnectPacket;
use pocketmine\network\protocol\DropItemPacket; use pocketmine\network\mcpe\protocol\DropItemPacket;
use pocketmine\network\protocol\EntityEventPacket; use pocketmine\network\mcpe\protocol\EntityEventPacket;
use pocketmine\network\protocol\ExplodePacket; use pocketmine\network\mcpe\protocol\ExplodePacket;
use pocketmine\network\protocol\FullChunkDataPacket; use pocketmine\network\mcpe\protocol\FullChunkDataPacket;
use pocketmine\network\protocol\HurtArmorPacket; use pocketmine\network\mcpe\protocol\HurtArmorPacket;
use pocketmine\network\protocol\InteractPacket; use pocketmine\network\mcpe\protocol\InteractPacket;
use pocketmine\network\protocol\InventoryActionPacket; use pocketmine\network\mcpe\protocol\InventoryActionPacket;
use pocketmine\network\protocol\ItemFrameDropItemPacket; use pocketmine\network\mcpe\protocol\ItemFrameDropItemPacket;
use pocketmine\network\protocol\LevelEventPacket; use pocketmine\network\mcpe\protocol\LevelEventPacket;
use pocketmine\network\protocol\LevelSoundEventPacket; use pocketmine\network\mcpe\protocol\LevelSoundEventPacket;
use pocketmine\network\protocol\LoginPacket; use pocketmine\network\mcpe\protocol\LoginPacket;
use pocketmine\network\protocol\MobArmorEquipmentPacket; use pocketmine\network\mcpe\protocol\MobArmorEquipmentPacket;
use pocketmine\network\protocol\MobEffectPacket; use pocketmine\network\mcpe\protocol\MobEffectPacket;
use pocketmine\network\protocol\MobEquipmentPacket; use pocketmine\network\mcpe\protocol\MobEquipmentPacket;
use pocketmine\network\protocol\MoveEntityPacket; use pocketmine\network\mcpe\protocol\MoveEntityPacket;
use pocketmine\network\protocol\MovePlayerPacket; use pocketmine\network\mcpe\protocol\MovePlayerPacket;
use pocketmine\network\protocol\PlayerActionPacket; use pocketmine\network\mcpe\protocol\PlayerActionPacket;
use pocketmine\network\protocol\PlayerFallPacket; use pocketmine\network\mcpe\protocol\PlayerFallPacket;
use pocketmine\network\protocol\PlayerInputPacket; use pocketmine\network\mcpe\protocol\PlayerInputPacket;
use pocketmine\network\protocol\PlayerListPacket; use pocketmine\network\mcpe\protocol\PlayerListPacket;
use pocketmine\network\protocol\PlayStatusPacket; use pocketmine\network\mcpe\protocol\PlayStatusPacket;
use pocketmine\network\protocol\RemoveBlockPacket; use pocketmine\network\mcpe\protocol\RemoveBlockPacket;
use pocketmine\network\protocol\RemoveEntityPacket; use pocketmine\network\mcpe\protocol\RemoveEntityPacket;
use pocketmine\network\protocol\ReplaceItemInSlotPacket; use pocketmine\network\mcpe\protocol\ReplaceItemInSlotPacket;
use pocketmine\network\protocol\RequestChunkRadiusPacket; use pocketmine\network\mcpe\protocol\RequestChunkRadiusPacket;
use pocketmine\network\protocol\ResourcePackClientResponsePacket; use pocketmine\network\mcpe\protocol\ResourcePackClientResponsePacket;
use pocketmine\network\protocol\ResourcePacksInfoPacket; use pocketmine\network\mcpe\protocol\ResourcePacksInfoPacket;
use pocketmine\network\protocol\ResourcePackStackPacket; use pocketmine\network\mcpe\protocol\ResourcePackStackPacket;
use pocketmine\network\protocol\RespawnPacket; use pocketmine\network\mcpe\protocol\RespawnPacket;
use pocketmine\network\protocol\RiderJumpPacket; use pocketmine\network\mcpe\protocol\RiderJumpPacket;
use pocketmine\network\protocol\SetCommandsEnabledPacket; use pocketmine\network\mcpe\protocol\SetCommandsEnabledPacket;
use pocketmine\network\protocol\SetDifficultyPacket; use pocketmine\network\mcpe\protocol\SetDifficultyPacket;
use pocketmine\network\protocol\SetEntityDataPacket; use pocketmine\network\mcpe\protocol\SetEntityDataPacket;
use pocketmine\network\protocol\SetEntityLinkPacket; use pocketmine\network\mcpe\protocol\SetEntityLinkPacket;
use pocketmine\network\protocol\SetEntityMotionPacket; use pocketmine\network\mcpe\protocol\SetEntityMotionPacket;
use pocketmine\network\protocol\SetHealthPacket; use pocketmine\network\mcpe\protocol\SetHealthPacket;
use pocketmine\network\protocol\SetPlayerGameTypePacket; use pocketmine\network\mcpe\protocol\SetPlayerGameTypePacket;
use pocketmine\network\protocol\SetSpawnPositionPacket; use pocketmine\network\mcpe\protocol\SetSpawnPositionPacket;
use pocketmine\network\protocol\SetTimePacket; use pocketmine\network\mcpe\protocol\SetTimePacket;
use pocketmine\network\protocol\ShowCreditsPacket; use pocketmine\network\mcpe\protocol\ShowCreditsPacket;
use pocketmine\network\protocol\SpawnExperienceOrbPacket; use pocketmine\network\mcpe\protocol\SpawnExperienceOrbPacket;
use pocketmine\network\protocol\StartGamePacket; use pocketmine\network\mcpe\protocol\StartGamePacket;
use pocketmine\network\protocol\TakeItemEntityPacket; use pocketmine\network\mcpe\protocol\TakeItemEntityPacket;
use pocketmine\network\protocol\TextPacket; use pocketmine\network\mcpe\protocol\TextPacket;
use pocketmine\network\protocol\TransferPacket; use pocketmine\network\mcpe\protocol\TransferPacket;
use pocketmine\network\protocol\UpdateAttributesPacket; use pocketmine\network\mcpe\protocol\UpdateAttributesPacket;
use pocketmine\network\protocol\UpdateBlockPacket; use pocketmine\network\mcpe\protocol\UpdateBlockPacket;
use pocketmine\network\protocol\UseItemPacket; use pocketmine\network\mcpe\protocol\UseItemPacket;
interface PocketEditionNetworkSession{ interface NetworkSession{
public function handleLogin(LoginPacket $packet) : bool; public function handleLogin(LoginPacket $packet) : bool;

13
src/pocketmine/network/RakLibInterface.php → src/pocketmine/network/mcpe/RakLibInterface.php
View File

@ -19,12 +19,13 @@
* *
*/ */
namespace pocketmine\network; namespace pocketmine\network\mcpe;
use pocketmine\event\player\PlayerCreationEvent; use pocketmine\event\player\PlayerCreationEvent;
use pocketmine\network\protocol\DataPacket; use pocketmine\network\AdvancedSourceInterface;
use pocketmine\network\protocol\Info; use pocketmine\network\mcpe\protocol\DataPacket;
use pocketmine\network\protocol\Info as ProtocolInfo; use pocketmine\network\mcpe\protocol\ProtocolInfo;
use pocketmine\network\Network;
use pocketmine\Player; use pocketmine\Player;
use pocketmine\Server; use pocketmine\Server;
use raklib\protocol\EncapsulatedPacket; use raklib\protocol\EncapsulatedPacket;
@ -175,8 +176,8 @@ class RakLibInterface implements ServerInstance, AdvancedSourceInterface{
$this->interface->sendOption("name", $this->interface->sendOption("name",
"MCPE;" . rtrim(addcslashes($name, ";"), '\\') . ";" . "MCPE;" . rtrim(addcslashes($name, ";"), '\\') . ";" .
Info::CURRENT_PROTOCOL . ";" . ProtocolInfo::CURRENT_PROTOCOL . ";" .
Info::MINECRAFT_VERSION_NETWORK . ";" . ProtocolInfo::MINECRAFT_VERSION_NETWORK . ";" .
$info->getPlayerCount() . ";" . $info->getPlayerCount() . ";" .
$info->getMaxPlayerCount() $info->getMaxPlayerCount()
); );

8
src/pocketmine/network/protocol/AddEntityPacket.php → src/pocketmine/network/mcpe/protocol/AddEntityPacket.php
View File

@ -19,15 +19,15 @@
* *
*/ */
namespace pocketmine\network\protocol; namespace pocketmine\network\mcpe\protocol;
#include <rules/DataPacket.h> #include <rules/DataPacket.h>
use pocketmine\entity\Attribute; use pocketmine\entity\Attribute;
use pocketmine\network\PocketEditionNetworkSession; use pocketmine\network\mcpe\NetworkSession;
class AddEntityPacket extends DataPacket{ class AddEntityPacket extends DataPacket{
const NETWORK_ID = Info::ADD_ENTITY_PACKET; const NETWORK_ID = ProtocolInfo::ADD_ENTITY_PACKET;
public $eid; public $eid;
public $type; public $type;
@ -73,7 +73,7 @@ class AddEntityPacket extends DataPacket{
} }
} }
public function handle(PocketEditionNetworkSession $session) : bool{ public function handle(NetworkSession $session) : bool{
return $session->handleAddEntity($this); return $session->handleAddEntity($this);
} }

8
src/pocketmine/network/protocol/AddHangingEntityPacket.php → src/pocketmine/network/mcpe/protocol/AddHangingEntityPacket.php
View File

@ -19,14 +19,14 @@
* *
*/ */
namespace pocketmine\network\protocol; namespace pocketmine\network\mcpe\protocol;
#include <rules/DataPacket.h> #include <rules/DataPacket.h>
use pocketmine\network\PocketEditionNetworkSession; use pocketmine\network\mcpe\NetworkSession;
class AddHangingEntityPacket extends DataPacket{ class AddHangingEntityPacket extends DataPacket{
const NETWORK_ID = Info::ADD_HANGING_ENTITY_PACKET; const NETWORK_ID = ProtocolInfo::ADD_HANGING_ENTITY_PACKET;
public $entityUniqueId; public $entityUniqueId;
public $entityRuntimeId; public $entityRuntimeId;
@ -47,7 +47,7 @@ class AddHangingEntityPacket extends DataPacket{
$this->putVarInt($this->unknown); $this->putVarInt($this->unknown);
} }
public function handle(PocketEditionNetworkSession $session) : bool{ public function handle(NetworkSession $session) : bool{
return $session->handleAddHangingEntity($this); return $session->handleAddHangingEntity($this);
} }

8
src/pocketmine/network/protocol/AddItemEntityPacket.php → src/pocketmine/network/mcpe/protocol/AddItemEntityPacket.php
View File

@ -19,15 +19,15 @@
* *
*/ */
namespace pocketmine\network\protocol; namespace pocketmine\network\mcpe\protocol;
#include <rules/DataPacket.h> #include <rules/DataPacket.h>
use pocketmine\network\PocketEditionNetworkSession; use pocketmine\network\mcpe\NetworkSession;
class AddItemEntityPacket extends DataPacket{ class AddItemEntityPacket extends DataPacket{
const NETWORK_ID = Info::ADD_ITEM_ENTITY_PACKET; const NETWORK_ID = ProtocolInfo::ADD_ITEM_ENTITY_PACKET;
public $eid; public $eid;
public $item; public $item;
@ -51,7 +51,7 @@ class AddItemEntityPacket extends DataPacket{
$this->putVector3f($this->speedX, $this->speedY, $this->speedZ); $this->putVector3f($this->speedX, $this->speedY, $this->speedZ);
} }
public function handle(PocketEditionNetworkSession $session) : bool{ public function handle(NetworkSession $session) : bool{
return $session->handleAddItemEntity($this); return $session->handleAddItemEntity($this);
} }

8
src/pocketmine/network/protocol/AddItemPacket.php → src/pocketmine/network/mcpe/protocol/AddItemPacket.php
View File

@ -19,15 +19,15 @@
* *
*/ */
namespace pocketmine\network\protocol; namespace pocketmine\network\mcpe\protocol;
#include <rules/DataPacket.h> #include <rules/DataPacket.h>
use pocketmine\network\PocketEditionNetworkSession; use pocketmine\network\mcpe\NetworkSession;
class AddItemPacket extends DataPacket{ class AddItemPacket extends DataPacket{
const NETWORK_ID = Info::ADD_ITEM_PACKET; const NETWORK_ID = ProtocolInfo::ADD_ITEM_PACKET;
public $item; public $item;
@ -40,7 +40,7 @@ class AddItemPacket extends DataPacket{
$this->putSlot($this->item); $this->putSlot($this->item);
} }
public function handle(PocketEditionNetworkSession $session) : bool{ public function handle(NetworkSession $session) : bool{
return $session->handleAddItem($this); return $session->handleAddItem($this);
} }

8
src/pocketmine/network/protocol/AddPaintingPacket.php → src/pocketmine/network/mcpe/protocol/AddPaintingPacket.php
View File

@ -19,15 +19,15 @@
* *
*/ */
namespace pocketmine\network\protocol; namespace pocketmine\network\mcpe\protocol;
#include <rules/DataPacket.h> #include <rules/DataPacket.h>
use pocketmine\network\PocketEditionNetworkSession; use pocketmine\network\mcpe\NetworkSession;
class AddPaintingPacket extends DataPacket{ class AddPaintingPacket extends DataPacket{
const NETWORK_ID = Info::ADD_PAINTING_PACKET; const NETWORK_ID = ProtocolInfo::ADD_PAINTING_PACKET;
public $eid; public $eid;
public $x; public $x;
@ -49,7 +49,7 @@ class AddPaintingPacket extends DataPacket{
$this->putString($this->title); $this->putString($this->title);
} }
public function handle(PocketEditionNetworkSession $session) : bool{ public function handle(NetworkSession $session) : bool{
return $session->handleAddPainting($this); return $session->handleAddPainting($this);
} }

8
src/pocketmine/network/protocol/AddPlayerPacket.php → src/pocketmine/network/mcpe/protocol/AddPlayerPacket.php
View File

@ -19,14 +19,14 @@
* *
*/ */
namespace pocketmine\network\protocol; namespace pocketmine\network\mcpe\protocol;
#include <rules/DataPacket.h> #include <rules/DataPacket.h>
use pocketmine\network\PocketEditionNetworkSession; use pocketmine\network\mcpe\NetworkSession;
class AddPlayerPacket extends DataPacket{ class AddPlayerPacket extends DataPacket{
const NETWORK_ID = Info::ADD_PLAYER_PACKET; const NETWORK_ID = ProtocolInfo::ADD_PLAYER_PACKET;
public $uuid; public $uuid;
public $username; public $username;
@ -62,7 +62,7 @@ class AddPlayerPacket extends DataPacket{
$this->putEntityMetadata($this->metadata); $this->putEntityMetadata($this->metadata);
} }
public function handle(PocketEditionNetworkSession $session) : bool{ public function handle(NetworkSession $session) : bool{
return $session->handleAddPlayer($this); return $session->handleAddPlayer($this);
} }

8
src/pocketmine/network/protocol/AdventureSettingsPacket.php → src/pocketmine/network/mcpe/protocol/AdventureSettingsPacket.php
View File

@ -19,15 +19,15 @@
* *
*/ */
namespace pocketmine\network\protocol; namespace pocketmine\network\mcpe\protocol;
#include <rules/DataPacket.h> #include <rules/DataPacket.h>
use pocketmine\network\PocketEditionNetworkSession; use pocketmine\network\mcpe\NetworkSession;
class AdventureSettingsPacket extends DataPacket{ class AdventureSettingsPacket extends DataPacket{
const NETWORK_ID = Info::ADVENTURE_SETTINGS_PACKET; const NETWORK_ID = ProtocolInfo::ADVENTURE_SETTINGS_PACKET;
const PERMISSION_NORMAL = 0; const PERMISSION_NORMAL = 0;
const PERMISSION_OPERATOR = 1; const PERMISSION_OPERATOR = 1;
@ -97,7 +97,7 @@ class AdventureSettingsPacket extends DataPacket{
$this->putUnsignedVarInt($this->userPermission); $this->putUnsignedVarInt($this->userPermission);
} }
public function handle(PocketEditionNetworkSession $session) : bool{ public function handle(NetworkSession $session) : bool{
return $session->handleAdventureSettings($this); return $session->handleAdventureSettings($this);
} }

8
src/pocketmine/network/protocol/AnimatePacket.php → src/pocketmine/network/mcpe/protocol/AnimatePacket.php
View File

@ -19,15 +19,15 @@
* *
*/ */
namespace pocketmine\network\protocol; namespace pocketmine\network\mcpe\protocol;
#include <rules/DataPacket.h> #include <rules/DataPacket.h>
use pocketmine\network\PocketEditionNetworkSession; use pocketmine\network\mcpe\NetworkSession;
class AnimatePacket extends DataPacket{ class AnimatePacket extends DataPacket{
const NETWORK_ID = Info::ANIMATE_PACKET; const NETWORK_ID = ProtocolInfo::ANIMATE_PACKET;
public $action; public $action;
public $eid; public $eid;
@ -43,7 +43,7 @@ class AnimatePacket extends DataPacket{
$this->putEntityId($this->eid); $this->putEntityId($this->eid);
} }
public function handle(PocketEditionNetworkSession $session) : bool{ public function handle(NetworkSession $session) : bool{
return $session->handleAnimate($this); return $session->handleAnimate($this);
} }

8
src/pocketmine/network/protocol/AvailableCommandsPacket.php → src/pocketmine/network/mcpe/protocol/AvailableCommandsPacket.php
View File

@ -19,14 +19,14 @@
* *
*/ */
namespace pocketmine\network\protocol; namespace pocketmine\network\mcpe\protocol;
#include <rules/DataPacket.h> #include <rules/DataPacket.h>
use pocketmine\network\PocketEditionNetworkSession; use pocketmine\network\mcpe\NetworkSession;
class AvailableCommandsPacket extends DataPacket{ class AvailableCommandsPacket extends DataPacket{
const NETWORK_ID = Info::AVAILABLE_COMMANDS_PACKET; const NETWORK_ID = ProtocolInfo::AVAILABLE_COMMANDS_PACKET;
public $commands; //JSON-encoded command data public $commands; //JSON-encoded command data
public $unknown; public $unknown;
@ -41,7 +41,7 @@ class AvailableCommandsPacket extends DataPacket{
$this->putString($this->unknown); $this->putString($this->unknown);
} }
public function handle(PocketEditionNetworkSession $session) : bool{ public function handle(NetworkSession $session) : bool{
return $session->handleAvailableCommands($this); return $session->handleAvailableCommands($this);
} }

8
src/pocketmine/network/protocol/BatchPacket.php → src/pocketmine/network/mcpe/protocol/BatchPacket.php
View File

@ -19,15 +19,15 @@
* *
*/ */
namespace pocketmine\network\protocol; namespace pocketmine\network\mcpe\protocol;
#include <rules/DataPacket.h> #include <rules/DataPacket.h>
use pocketmine\network\PocketEditionNetworkSession; use pocketmine\network\mcpe\NetworkSession;
class BatchPacket extends DataPacket{ class BatchPacket extends DataPacket{
const NETWORK_ID = Info::BATCH_PACKET; const NETWORK_ID = ProtocolInfo::BATCH_PACKET;
public $payload; public $payload;
@ -40,7 +40,7 @@ class BatchPacket extends DataPacket{
$this->putString($this->payload); $this->putString($this->payload);
} }
public function handle(PocketEditionNetworkSession $session) : bool{ public function handle(NetworkSession $session) : bool{
return $session->handleBatch($this); return $session->handleBatch($this);
} }

8
src/pocketmine/network/protocol/BlockEntityDataPacket.php → src/pocketmine/network/mcpe/protocol/BlockEntityDataPacket.php
View File

@ -19,15 +19,15 @@
* *
*/ */
namespace pocketmine\network\protocol; namespace pocketmine\network\mcpe\protocol;
#include <rules/DataPacket.h> #include <rules/DataPacket.h>
use pocketmine\network\PocketEditionNetworkSession; use pocketmine\network\mcpe\NetworkSession;
class BlockEntityDataPacket extends DataPacket{ class BlockEntityDataPacket extends DataPacket{
const NETWORK_ID = Info::BLOCK_ENTITY_DATA_PACKET; const NETWORK_ID = ProtocolInfo::BLOCK_ENTITY_DATA_PACKET;
public $x; public $x;
public $y; public $y;
@ -45,7 +45,7 @@ class BlockEntityDataPacket extends DataPacket{
$this->put($this->namedtag); $this->put($this->namedtag);
} }
public function handle(PocketEditionNetworkSession $session) : bool{ public function handle(NetworkSession $session) : bool{
return $session->handleBlockEntityData($this); return $session->handleBlockEntityData($this);
} }

8
src/pocketmine/network/protocol/BlockEventPacket.php → src/pocketmine/network/mcpe/protocol/BlockEventPacket.php
View File

@ -19,15 +19,15 @@
* *
*/ */
namespace pocketmine\network\protocol; namespace pocketmine\network\mcpe\protocol;
#include <rules/DataPacket.h> #include <rules/DataPacket.h>
use pocketmine\network\PocketEditionNetworkSession; use pocketmine\network\mcpe\NetworkSession;
class BlockEventPacket extends DataPacket{ class BlockEventPacket extends DataPacket{
const NETWORK_ID = Info::BLOCK_EVENT_PACKET; const NETWORK_ID = ProtocolInfo::BLOCK_EVENT_PACKET;
public $x; public $x;
public $y; public $y;
@ -46,7 +46,7 @@ class BlockEventPacket extends DataPacket{
$this->putVarInt($this->case2); $this->putVarInt($this->case2);
} }
public function handle(PocketEditionNetworkSession $session) : bool{ public function handle(NetworkSession $session) : bool{
return $session->handleBlockEvent($this); return $session->handleBlockEvent($this);
} }

8
src/pocketmine/network/protocol/ChangeDimensionPacket.php → src/pocketmine/network/mcpe/protocol/ChangeDimensionPacket.php
View File

@ -19,15 +19,15 @@
* *
*/ */
namespace pocketmine\network\protocol; namespace pocketmine\network\mcpe\protocol;
#include <rules/DataPacket.h> #include <rules/DataPacket.h>
use pocketmine\network\PocketEditionNetworkSession; use pocketmine\network\mcpe\NetworkSession;
class ChangeDimensionPacket extends DataPacket{ class ChangeDimensionPacket extends DataPacket{
const NETWORK_ID = Info::CHANGE_DIMENSION_PACKET; const NETWORK_ID = ProtocolInfo::CHANGE_DIMENSION_PACKET;
const DIMENSION_OVERWORLD = 0; const DIMENSION_OVERWORLD = 0;
const DIMENSION_NETHER = 1; const DIMENSION_NETHER = 1;
@ -49,7 +49,7 @@ class ChangeDimensionPacket extends DataPacket{
$this->putBool($this->unknown); $this->putBool($this->unknown);
} }
public function handle(PocketEditionNetworkSession $session) : bool{ public function handle(NetworkSession $session) : bool{
return $session->handleChangeDimension($this); return $session->handleChangeDimension($this);
} }

8
src/pocketmine/network/protocol/ChunkRadiusUpdatedPacket.php → src/pocketmine/network/mcpe/protocol/ChunkRadiusUpdatedPacket.php
View File

@ -19,15 +19,15 @@
* *
*/ */
namespace pocketmine\network\protocol; namespace pocketmine\network\mcpe\protocol;
#include <rules/DataPacket.h> #include <rules/DataPacket.h>
use pocketmine\network\PocketEditionNetworkSession; use pocketmine\network\mcpe\NetworkSession;
class ChunkRadiusUpdatedPacket extends DataPacket{ class ChunkRadiusUpdatedPacket extends DataPacket{
const NETWORK_ID = Info::CHUNK_RADIUS_UPDATED_PACKET; const NETWORK_ID = ProtocolInfo::CHUNK_RADIUS_UPDATED_PACKET;
public $radius; public $radius;
@ -39,7 +39,7 @@ class ChunkRadiusUpdatedPacket extends DataPacket{
$this->putVarInt($this->radius); $this->putVarInt($this->radius);
} }
public function handle(PocketEditionNetworkSession $session) : bool{ public function handle(NetworkSession $session) : bool{
return $session->handleChunkRadiusUpdated($this); return $session->handleChunkRadiusUpdated($this);
} }

8
src/pocketmine/network/protocol/CommandStepPacket.php → src/pocketmine/network/mcpe/protocol/CommandStepPacket.php
View File

@ -19,14 +19,14 @@
* *
*/ */
namespace pocketmine\network\protocol; namespace pocketmine\network\mcpe\protocol;
#include <rules/DataPacket.h> #include <rules/DataPacket.h>
use pocketmine\network\PocketEditionNetworkSession; use pocketmine\network\mcpe\NetworkSession;
class CommandStepPacket extends DataPacket{ class CommandStepPacket extends DataPacket{
const NETWORK_ID = Info::COMMAND_STEP_PACKET; const NETWORK_ID = ProtocolInfo::COMMAND_STEP_PACKET;
/** /**
* unknown (string) * unknown (string)
@ -67,7 +67,7 @@ class CommandStepPacket extends DataPacket{
} }
public function handle(PocketEditionNetworkSession $session) : bool{ public function handle(NetworkSession $session) : bool{
return $session->handleCommandStep($this); return $session->handleCommandStep($this);
} }

8
src/pocketmine/network/protocol/ContainerClosePacket.php → src/pocketmine/network/mcpe/protocol/ContainerClosePacket.php
View File

@ -19,15 +19,15 @@
* *
*/ */
namespace pocketmine\network\protocol; namespace pocketmine\network\mcpe\protocol;
#include <rules/DataPacket.h> #include <rules/DataPacket.h>
use pocketmine\network\PocketEditionNetworkSession; use pocketmine\network\mcpe\NetworkSession;
class ContainerClosePacket extends DataPacket{ class ContainerClosePacket extends DataPacket{
const NETWORK_ID = Info::CONTAINER_CLOSE_PACKET; const NETWORK_ID = ProtocolInfo::CONTAINER_CLOSE_PACKET;
public $windowid; public $windowid;
@ -40,7 +40,7 @@ class ContainerClosePacket extends DataPacket{
$this->putByte($this->windowid); $this->putByte($this->windowid);
} }
public function handle(PocketEditionNetworkSession $session) : bool{ public function handle(NetworkSession $session) : bool{
return $session->handleContainerClose($this); return $session->handleContainerClose($this);
} }
} }

8
src/pocketmine/network/protocol/ContainerOpenPacket.php → src/pocketmine/network/mcpe/protocol/ContainerOpenPacket.php
View File

@ -19,15 +19,15 @@
* *
*/ */
namespace pocketmine\network\protocol; namespace pocketmine\network\mcpe\protocol;
#include <rules/DataPacket.h> #include <rules/DataPacket.h>
use pocketmine\network\PocketEditionNetworkSession; use pocketmine\network\mcpe\NetworkSession;
class ContainerOpenPacket extends DataPacket{ class ContainerOpenPacket extends DataPacket{
const NETWORK_ID = Info::CONTAINER_OPEN_PACKET; const NETWORK_ID = ProtocolInfo::CONTAINER_OPEN_PACKET;
public $windowid; public $windowid;
public $type; public $type;
@ -50,7 +50,7 @@ class ContainerOpenPacket extends DataPacket{
$this->putEntityId($this->entityId); $this->putEntityId($this->entityId);
} }
public function handle(PocketEditionNetworkSession $session) : bool{ public function handle(NetworkSession $session) : bool{
return $session->handleContainerOpen($this); return $session->handleContainerOpen($this);
} }

8
src/pocketmine/network/protocol/ContainerSetContentPacket.php → src/pocketmine/network/mcpe/protocol/ContainerSetContentPacket.php
View File

@ -19,15 +19,15 @@
* *
*/ */
namespace pocketmine\network\protocol; namespace pocketmine\network\mcpe\protocol;
#include <rules/DataPacket.h> #include <rules/DataPacket.h>
use pocketmine\network\PocketEditionNetworkSession; use pocketmine\network\mcpe\NetworkSession;
class ContainerSetContentPacket extends DataPacket{ class ContainerSetContentPacket extends DataPacket{
const NETWORK_ID = Info::CONTAINER_SET_CONTENT_PACKET; const NETWORK_ID = ProtocolInfo::CONTAINER_SET_CONTENT_PACKET;
const SPECIAL_INVENTORY = 0; const SPECIAL_INVENTORY = 0;
const SPECIAL_ARMOR = 0x78; const SPECIAL_ARMOR = 0x78;
@ -75,7 +75,7 @@ class ContainerSetContentPacket extends DataPacket{
} }
} }
public function handle(PocketEditionNetworkSession $session) : bool{ public function handle(NetworkSession $session) : bool{
return $session->handleContainerSetContent($this); return $session->handleContainerSetContent($this);
} }

8
src/pocketmine/network/protocol/ContainerSetDataPacket.php → src/pocketmine/network/mcpe/protocol/ContainerSetDataPacket.php
View File

@ -19,15 +19,15 @@
* *
*/ */
namespace pocketmine\network\protocol; namespace pocketmine\network\mcpe\protocol;
#include <rules/DataPacket.h> #include <rules/DataPacket.h>
use pocketmine\network\PocketEditionNetworkSession; use pocketmine\network\mcpe\NetworkSession;
class ContainerSetDataPacket extends DataPacket{ class ContainerSetDataPacket extends DataPacket{
const NETWORK_ID = Info::CONTAINER_SET_DATA_PACKET; const NETWORK_ID = ProtocolInfo::CONTAINER_SET_DATA_PACKET;
public $windowid; public $windowid;
public $property; public $property;
@ -44,7 +44,7 @@ class ContainerSetDataPacket extends DataPacket{
$this->putVarInt($this->value); $this->putVarInt($this->value);
} }
public function handle(PocketEditionNetworkSession $session) : bool{ public function handle(NetworkSession $session) : bool{
return $session->handleContainerSetData($this); return $session->handleContainerSetData($this);
} }

8
src/pocketmine/network/protocol/ContainerSetSlotPacket.php → src/pocketmine/network/mcpe/protocol/ContainerSetSlotPacket.php
View File

@ -19,15 +19,15 @@
* *
*/ */
namespace pocketmine\network\protocol; namespace pocketmine\network\mcpe\protocol;
#include <rules/DataPacket.h> #include <rules/DataPacket.h>
use pocketmine\item\Item; use pocketmine\item\Item;
use pocketmine\network\PocketEditionNetworkSession; use pocketmine\network\mcpe\NetworkSession;
class ContainerSetSlotPacket extends DataPacket{ class ContainerSetSlotPacket extends DataPacket{
const NETWORK_ID = Info::CONTAINER_SET_SLOT_PACKET; const NETWORK_ID = ProtocolInfo::CONTAINER_SET_SLOT_PACKET;
public $windowid; public $windowid;
public $slot; public $slot;
@ -53,7 +53,7 @@ class ContainerSetSlotPacket extends DataPacket{
$this->putByte($this->unknown); $this->putByte($this->unknown);
} }
public function handle(PocketEditionNetworkSession $session) : bool{ public function handle(NetworkSession $session) : bool{
return $session->handleContainerSetSlot($this); return $session->handleContainerSetSlot($this);
} }

9
src/pocketmine/network/protocol/CraftingDataPacket.php → src/pocketmine/network/mcpe/protocol/CraftingDataPacket.php
View File

@ -19,21 +19,20 @@
* *
*/ */
namespace pocketmine\network\protocol; namespace pocketmine\network\mcpe\protocol;
#include <rules/DataPacket.h> #include <rules/DataPacket.h>
use pocketmine\inventory\FurnaceRecipe; use pocketmine\inventory\FurnaceRecipe;
use pocketmine\inventory\MultiRecipe;
use pocketmine\inventory\ShapedRecipe; use pocketmine\inventory\ShapedRecipe;
use pocketmine\inventory\ShapelessRecipe; use pocketmine\inventory\ShapelessRecipe;
use pocketmine\item\Item; use pocketmine\item\Item;
use pocketmine\network\PocketEditionNetworkSession; use pocketmine\network\mcpe\NetworkSession;
use pocketmine\utils\BinaryStream; use pocketmine\utils\BinaryStream;
class CraftingDataPacket extends DataPacket{ class CraftingDataPacket extends DataPacket{
const NETWORK_ID = Info::CRAFTING_DATA_PACKET; const NETWORK_ID = ProtocolInfo::CRAFTING_DATA_PACKET;
const ENTRY_SHAPELESS = 0; const ENTRY_SHAPELESS = 0;
const ENTRY_SHAPED = 1; const ENTRY_SHAPED = 1;
@ -199,7 +198,7 @@ class CraftingDataPacket extends DataPacket{
$this->putBool($this->cleanRecipes); $this->putBool($this->cleanRecipes);
} }
public function handle(PocketEditionNetworkSession $session) : bool{ public function handle(NetworkSession $session) : bool{
return $session->handleCraftingData($this); return $session->handleCraftingData($this);
} }

8
src/pocketmine/network/protocol/CraftingEventPacket.php → src/pocketmine/network/mcpe/protocol/CraftingEventPacket.php
View File

@ -19,15 +19,15 @@
* *
*/ */
namespace pocketmine\network\protocol; namespace pocketmine\network\mcpe\protocol;
#include <rules/DataPacket.h> #include <rules/DataPacket.h>
use pocketmine\item\Item; use pocketmine\item\Item;
use pocketmine\network\PocketEditionNetworkSession; use pocketmine\network\mcpe\NetworkSession;
class CraftingEventPacket extends DataPacket{ class CraftingEventPacket extends DataPacket{
const NETWORK_ID = Info::CRAFTING_EVENT_PACKET; const NETWORK_ID = ProtocolInfo::CRAFTING_EVENT_PACKET;
public $windowId; public $windowId;
public $type; public $type;
@ -63,7 +63,7 @@ class CraftingEventPacket extends DataPacket{
} }
public function handle(PocketEditionNetworkSession $session) : bool{ public function handle(NetworkSession $session) : bool{
return $session->handleCraftingEvent($this); return $session->handleCraftingEvent($this);
} }

6
src/pocketmine/network/protocol/DataPacket.php → src/pocketmine/network/mcpe/protocol/DataPacket.php
View File

@ -19,13 +19,13 @@
* *
*/ */
namespace pocketmine\network\protocol; namespace pocketmine\network\mcpe\protocol;
#include <rules/DataPacket.h> #include <rules/DataPacket.h>
use pocketmine\entity\Entity; use pocketmine\entity\Entity;
use pocketmine\item\Item; use pocketmine\item\Item;
use pocketmine\network\PocketEditionNetworkSession; use pocketmine\network\mcpe\NetworkSession;
use pocketmine\utils\BinaryStream; use pocketmine\utils\BinaryStream;
use pocketmine\utils\Utils; use pocketmine\utils\Utils;
@ -44,7 +44,7 @@ abstract class DataPacket extends BinaryStream{
abstract public function decode(); abstract public function decode();
abstract public function handle(PocketEditionNetworkSession $session) : bool; abstract public function handle(NetworkSession $session) : bool;
public function reset(){ public function reset(){
$this->buffer = chr($this::NETWORK_ID); $this->buffer = chr($this::NETWORK_ID);

8
src/pocketmine/network/protocol/DisconnectPacket.php → src/pocketmine/network/mcpe/protocol/DisconnectPacket.php
View File

@ -19,15 +19,15 @@
* *
*/ */
namespace pocketmine\network\protocol; namespace pocketmine\network\mcpe\protocol;
#include <rules/DataPacket.h> #include <rules/DataPacket.h>
use pocketmine\network\PocketEditionNetworkSession; use pocketmine\network\mcpe\NetworkSession;
class DisconnectPacket extends DataPacket{ class DisconnectPacket extends DataPacket{
const NETWORK_ID = Info::DISCONNECT_PACKET; const NETWORK_ID = ProtocolInfo::DISCONNECT_PACKET;
public $hideDisconnectionScreen = false; public $hideDisconnectionScreen = false;
public $message; public $message;
@ -43,7 +43,7 @@ class DisconnectPacket extends DataPacket{
$this->putString($this->message); $this->putString($this->message);
} }
public function handle(PocketEditionNetworkSession $session) : bool{ public function handle(NetworkSession $session) : bool{
return $session->handleDisconnect($this); return $session->handleDisconnect($this);
} }

8
src/pocketmine/network/protocol/DropItemPacket.php → src/pocketmine/network/mcpe/protocol/DropItemPacket.php
View File

@ -19,15 +19,15 @@
* *
*/ */
namespace pocketmine\network\protocol; namespace pocketmine\network\mcpe\protocol;
#include <rules/DataPacket.h> #include <rules/DataPacket.h>
use pocketmine\network\PocketEditionNetworkSession; use pocketmine\network\mcpe\NetworkSession;
class DropItemPacket extends DataPacket{ class DropItemPacket extends DataPacket{
const NETWORK_ID = Info::DROP_ITEM_PACKET; const NETWORK_ID = ProtocolInfo::DROP_ITEM_PACKET;
public $type; public $type;
public $item; public $item;
@ -41,7 +41,7 @@ class DropItemPacket extends DataPacket{
} }
public function handle(PocketEditionNetworkSession $session) : bool{ public function handle(NetworkSession $session) : bool{
return $session->handleDropItem($this); return $session->handleDropItem($this);
} }

8
src/pocketmine/network/protocol/EntityEventPacket.php → src/pocketmine/network/mcpe/protocol/EntityEventPacket.php
View File

@ -19,15 +19,15 @@
* *
*/ */
namespace pocketmine\network\protocol; namespace pocketmine\network\mcpe\protocol;
#include <rules/DataPacket.h> #include <rules/DataPacket.h>
use pocketmine\network\PocketEditionNetworkSession; use pocketmine\network\mcpe\NetworkSession;
class EntityEventPacket extends DataPacket{ class EntityEventPacket extends DataPacket{
const NETWORK_ID = Info::ENTITY_EVENT_PACKET; const NETWORK_ID = ProtocolInfo::ENTITY_EVENT_PACKET;
const HURT_ANIMATION = 2; const HURT_ANIMATION = 2;
const DEATH_ANIMATION = 3; const DEATH_ANIMATION = 3;
@ -64,7 +64,7 @@ class EntityEventPacket extends DataPacket{
$this->putVarInt($this->unknown); $this->putVarInt($this->unknown);
} }
public function handle(PocketEditionNetworkSession $session) : bool{ public function handle(NetworkSession $session) : bool{
return $session->handleEntityEvent($this); return $session->handleEntityEvent($this);
} }

8
src/pocketmine/network/protocol/ExplodePacket.php → src/pocketmine/network/mcpe/protocol/ExplodePacket.php
View File

@ -19,15 +19,15 @@
* *
*/ */
namespace pocketmine\network\protocol; namespace pocketmine\network\mcpe\protocol;
#include <rules/DataPacket.h> #include <rules/DataPacket.h>
use pocketmine\network\PocketEditionNetworkSession; use pocketmine\network\mcpe\NetworkSession;
class ExplodePacket extends DataPacket{ class ExplodePacket extends DataPacket{
const NETWORK_ID = Info::EXPLODE_PACKET; const NETWORK_ID = ProtocolInfo::EXPLODE_PACKET;
public $x; public $x;
public $y; public $y;
@ -56,7 +56,7 @@ class ExplodePacket extends DataPacket{
} }
} }
public function handle(PocketEditionNetworkSession $session) : bool{ public function handle(NetworkSession $session) : bool{
return $session->handleExplode($this); return $session->handleExplode($this);
} }

8
src/pocketmine/network/protocol/FullChunkDataPacket.php → src/pocketmine/network/mcpe/protocol/FullChunkDataPacket.php
View File

@ -19,15 +19,15 @@
* *
*/ */
namespace pocketmine\network\protocol; namespace pocketmine\network\mcpe\protocol;
#include <rules/DataPacket.h> #include <rules/DataPacket.h>
use pocketmine\network\PocketEditionNetworkSession; use pocketmine\network\mcpe\NetworkSession;
class FullChunkDataPacket extends DataPacket{ class FullChunkDataPacket extends DataPacket{
const NETWORK_ID = Info::FULL_CHUNK_DATA_PACKET; const NETWORK_ID = ProtocolInfo::FULL_CHUNK_DATA_PACKET;
public $chunkX; public $chunkX;
public $chunkZ; public $chunkZ;
@ -44,7 +44,7 @@ class FullChunkDataPacket extends DataPacket{
$this->putString($this->data); $this->putString($this->data);
} }
public function handle(PocketEditionNetworkSession $session) : bool{ public function handle(NetworkSession $session) : bool{
return $session->handleFullChunkData($this); return $session->handleFullChunkData($this);
} }

8
src/pocketmine/network/protocol/HurtArmorPacket.php → src/pocketmine/network/mcpe/protocol/HurtArmorPacket.php
View File

@ -19,15 +19,15 @@
* *
*/ */
namespace pocketmine\network\protocol; namespace pocketmine\network\mcpe\protocol;
#include <rules/DataPacket.h> #include <rules/DataPacket.h>
use pocketmine\network\PocketEditionNetworkSession; use pocketmine\network\mcpe\NetworkSession;
class HurtArmorPacket extends DataPacket{ class HurtArmorPacket extends DataPacket{
const NETWORK_ID = Info::HURT_ARMOR_PACKET; const NETWORK_ID = ProtocolInfo::HURT_ARMOR_PACKET;
public $health; public $health;
@ -40,7 +40,7 @@ class HurtArmorPacket extends DataPacket{
$this->putVarInt($this->health); $this->putVarInt($this->health);
} }
public function handle(PocketEditionNetworkSession $session) : bool{ public function handle(NetworkSession $session) : bool{
return $session->handleHurtArmor($this); return $session->handleHurtArmor($this);
} }

8
src/pocketmine/network/protocol/InteractPacket.php → src/pocketmine/network/mcpe/protocol/InteractPacket.php
View File

@ -19,15 +19,15 @@
* *
*/ */
namespace pocketmine\network\protocol; namespace pocketmine\network\mcpe\protocol;
#include <rules/DataPacket.h> #include <rules/DataPacket.h>
use pocketmine\network\PocketEditionNetworkSession; use pocketmine\network\mcpe\NetworkSession;
class InteractPacket extends DataPacket{ class InteractPacket extends DataPacket{
const NETWORK_ID = Info::INTERACT_PACKET; const NETWORK_ID = ProtocolInfo::INTERACT_PACKET;
const ACTION_RIGHT_CLICK = 1; const ACTION_RIGHT_CLICK = 1;
const ACTION_LEFT_CLICK = 2; const ACTION_LEFT_CLICK = 2;
@ -48,7 +48,7 @@ class InteractPacket extends DataPacket{
$this->putEntityId($this->target); $this->putEntityId($this->target);
} }
public function handle(PocketEditionNetworkSession $session) : bool{ public function handle(NetworkSession $session) : bool{
return $session->handleInteract($this); return $session->handleInteract($this);
} }

8
src/pocketmine/network/protocol/InventoryActionPacket.php → src/pocketmine/network/mcpe/protocol/InventoryActionPacket.php
View File

@ -19,14 +19,14 @@
* *
*/ */
namespace pocketmine\network\protocol; namespace pocketmine\network\mcpe\protocol;
#include <rules/DataPacket.h> #include <rules/DataPacket.h>
use pocketmine\network\PocketEditionNetworkSession; use pocketmine\network\mcpe\NetworkSession;
class InventoryActionPacket extends DataPacket{ class InventoryActionPacket extends DataPacket{
const NETWORK_ID = Info::INVENTORY_ACTION_PACKET; const NETWORK_ID = ProtocolInfo::INVENTORY_ACTION_PACKET;
public $unknown; public $unknown;
public $item; public $item;
@ -40,7 +40,7 @@ class InventoryActionPacket extends DataPacket{
$this->putSlot($this->item); $this->putSlot($this->item);
} }
public function handle(PocketEditionNetworkSession $session) : bool{ public function handle(NetworkSession $session) : bool{
return $session->handleInventoryAction($this); return $session->handleInventoryAction($this);
} }
} }

8
src/pocketmine/network/protocol/ItemFrameDropItemPacket.php → src/pocketmine/network/mcpe/protocol/ItemFrameDropItemPacket.php
View File

@ -19,15 +19,15 @@
* *
*/ */
namespace pocketmine\network\protocol; namespace pocketmine\network\mcpe\protocol;
#include <rules/DataPacket.h> #include <rules/DataPacket.h>
use pocketmine\network\PocketEditionNetworkSession; use pocketmine\network\mcpe\NetworkSession;
class ItemFrameDropItemPacket extends DataPacket{ class ItemFrameDropItemPacket extends DataPacket{
const NETWORK_ID = Info::ITEM_FRAME_DROP_ITEM_PACKET; const NETWORK_ID = ProtocolInfo::ITEM_FRAME_DROP_ITEM_PACKET;
public $x; public $x;
public $y; public $y;
@ -41,7 +41,7 @@ class ItemFrameDropItemPacket extends DataPacket{
} }
public function handle(PocketEditionNetworkSession $session) : bool{ public function handle(NetworkSession $session) : bool{
return $session->handleItemFrameDropItem($this); return $session->handleItemFrameDropItem($this);
} }

8
src/pocketmine/network/protocol/LevelEventPacket.php → src/pocketmine/network/mcpe/protocol/LevelEventPacket.php
View File

@ -19,14 +19,14 @@
* *
*/ */
namespace pocketmine\network\protocol; namespace pocketmine\network\mcpe\protocol;
#include <rules/DataPacket.h> #include <rules/DataPacket.h>
use pocketmine\network\PocketEditionNetworkSession; use pocketmine\network\mcpe\NetworkSession;
class LevelEventPacket extends DataPacket{ class LevelEventPacket extends DataPacket{
const NETWORK_ID = Info::LEVEL_EVENT_PACKET; const NETWORK_ID = ProtocolInfo::LEVEL_EVENT_PACKET;
const EVENT_SOUND_CLICK = 1000; const EVENT_SOUND_CLICK = 1000;
const EVENT_SOUND_CLICK_FAIL = 1001; const EVENT_SOUND_CLICK_FAIL = 1001;
@ -109,7 +109,7 @@ class LevelEventPacket extends DataPacket{
$this->putVarInt($this->data); $this->putVarInt($this->data);
} }
public function handle(PocketEditionNetworkSession $session) : bool{ public function handle(NetworkSession $session) : bool{
return $session->handleLevelEvent($this); return $session->handleLevelEvent($this);
} }

8
src/pocketmine/network/protocol/LevelSoundEventPacket.php → src/pocketmine/network/mcpe/protocol/LevelSoundEventPacket.php
View File

@ -19,14 +19,14 @@
* *
*/ */
namespace pocketmine\network\protocol; namespace pocketmine\network\mcpe\protocol;
#include <rules/DataPacket.h> #include <rules/DataPacket.h>
use pocketmine\network\PocketEditionNetworkSession; use pocketmine\network\mcpe\NetworkSession;
class LevelSoundEventPacket extends DataPacket{ class LevelSoundEventPacket extends DataPacket{
const NETWORK_ID = Info::LEVEL_SOUND_EVENT_PACKET; const NETWORK_ID = ProtocolInfo::LEVEL_SOUND_EVENT_PACKET;
const SOUND_ITEM_USE_ON = 0; const SOUND_ITEM_USE_ON = 0;
const SOUND_HIT = 1; const SOUND_HIT = 1;
@ -149,7 +149,7 @@ class LevelSoundEventPacket extends DataPacket{
$this->putBool($this->unknownBool2); $this->putBool($this->unknownBool2);
} }
public function handle(PocketEditionNetworkSession $session) : bool{ public function handle(NetworkSession $session) : bool{
return $session->handleLevelSoundEvent($this); return $session->handleLevelSoundEvent($this);
} }
} }

10
src/pocketmine/network/protocol/LoginPacket.php → src/pocketmine/network/mcpe/protocol/LoginPacket.php
View File

@ -19,15 +19,15 @@
* *
*/ */
namespace pocketmine\network\protocol; namespace pocketmine\network\mcpe\protocol;
#include <rules/DataPacket.h> #include <rules/DataPacket.h>
use pocketmine\network\PocketEditionNetworkSession; use pocketmine\network\mcpe\NetworkSession;
class LoginPacket extends DataPacket{ class LoginPacket extends DataPacket{
const NETWORK_ID = Info::LOGIN_PACKET; const NETWORK_ID = ProtocolInfo::LOGIN_PACKET;
const EDITION_POCKET = 0; const EDITION_POCKET = 0;
@ -47,7 +47,7 @@ class LoginPacket extends DataPacket{
public function decode(){ public function decode(){
$this->protocol = $this->getInt(); $this->protocol = $this->getInt();
if($this->protocol !== Info::CURRENT_PROTOCOL){ if($this->protocol !== ProtocolInfo::CURRENT_PROTOCOL){
$this->buffer = null; $this->buffer = null;
return; //Do not attempt to decode for non-accepted protocols return; //Do not attempt to decode for non-accepted protocols
} }
@ -96,7 +96,7 @@ class LoginPacket extends DataPacket{
return json_decode(base64_decode($payloadB64), true); return json_decode(base64_decode($payloadB64), true);
} }
public function handle(PocketEditionNetworkSession $session) : bool{ public function handle(NetworkSession $session) : bool{
return $session->handleLogin($this); return $session->handleLogin($this);
} }
} }

8
src/pocketmine/network/protocol/MobArmorEquipmentPacket.php → src/pocketmine/network/mcpe/protocol/MobArmorEquipmentPacket.php
View File

@ -19,15 +19,15 @@
* *
*/ */
namespace pocketmine\network\protocol; namespace pocketmine\network\mcpe\protocol;
#include <rules/DataPacket.h> #include <rules/DataPacket.h>
use pocketmine\network\PocketEditionNetworkSession; use pocketmine\network\mcpe\NetworkSession;
class MobArmorEquipmentPacket extends DataPacket{ class MobArmorEquipmentPacket extends DataPacket{
const NETWORK_ID = Info::MOB_ARMOR_EQUIPMENT_PACKET; const NETWORK_ID = ProtocolInfo::MOB_ARMOR_EQUIPMENT_PACKET;
public $eid; public $eid;
public $slots = []; public $slots = [];
@ -49,7 +49,7 @@ class MobArmorEquipmentPacket extends DataPacket{
$this->putSlot($this->slots[3]); $this->putSlot($this->slots[3]);
} }
public function handle(PocketEditionNetworkSession $session) : bool{ public function handle(NetworkSession $session) : bool{
return $session->handleMobArmorEquipment($this); return $session->handleMobArmorEquipment($this);
} }

8
src/pocketmine/network/protocol/MobEffectPacket.php → src/pocketmine/network/mcpe/protocol/MobEffectPacket.php
View File

@ -19,15 +19,15 @@
* *
*/ */
namespace pocketmine\network\protocol; namespace pocketmine\network\mcpe\protocol;
#include <rules/DataPacket.h> #include <rules/DataPacket.h>
use pocketmine\network\PocketEditionNetworkSession; use pocketmine\network\mcpe\NetworkSession;
class MobEffectPacket extends DataPacket{ class MobEffectPacket extends DataPacket{
const NETWORK_ID = Info::MOB_EFFECT_PACKET; const NETWORK_ID = ProtocolInfo::MOB_EFFECT_PACKET;
const EVENT_ADD = 1; const EVENT_ADD = 1;
const EVENT_MODIFY = 2; const EVENT_MODIFY = 2;
@ -54,7 +54,7 @@ class MobEffectPacket extends DataPacket{
$this->putVarInt($this->duration); $this->putVarInt($this->duration);
} }
public function handle(PocketEditionNetworkSession $session) : bool{ public function handle(NetworkSession $session) : bool{
return $session->handleMobEffect($this); return $session->handleMobEffect($this);
} }

8
src/pocketmine/network/protocol/MobEquipmentPacket.php → src/pocketmine/network/mcpe/protocol/MobEquipmentPacket.php
View File

@ -19,15 +19,15 @@
* *
*/ */
namespace pocketmine\network\protocol; namespace pocketmine\network\mcpe\protocol;
#include <rules/DataPacket.h> #include <rules/DataPacket.h>
use pocketmine\network\PocketEditionNetworkSession; use pocketmine\network\mcpe\NetworkSession;
class MobEquipmentPacket extends DataPacket{ class MobEquipmentPacket extends DataPacket{
const NETWORK_ID = Info::MOB_EQUIPMENT_PACKET; const NETWORK_ID = ProtocolInfo::MOB_EQUIPMENT_PACKET;
public $eid; public $eid;
public $item; public $item;
@ -52,7 +52,7 @@ class MobEquipmentPacket extends DataPacket{
$this->putByte($this->unknownByte); $this->putByte($this->unknownByte);
} }
public function handle(PocketEditionNetworkSession $session) : bool{ public function handle(NetworkSession $session) : bool{
return $session->handleMobEquipment($this); return $session->handleMobEquipment($this);
} }

8
src/pocketmine/network/protocol/MoveEntityPacket.php → src/pocketmine/network/mcpe/protocol/MoveEntityPacket.php
View File

@ -19,15 +19,15 @@
* *
*/ */
namespace pocketmine\network\protocol; namespace pocketmine\network\mcpe\protocol;
#include <rules/DataPacket.h> #include <rules/DataPacket.h>
use pocketmine\network\PocketEditionNetworkSession; use pocketmine\network\mcpe\NetworkSession;
class MoveEntityPacket extends DataPacket{ class MoveEntityPacket extends DataPacket{
const NETWORK_ID = Info::MOVE_ENTITY_PACKET; const NETWORK_ID = ProtocolInfo::MOVE_ENTITY_PACKET;
public $eid; public $eid;
public $x; public $x;
@ -54,7 +54,7 @@ class MoveEntityPacket extends DataPacket{
$this->putByte($this->headYaw / (360.0 / 256)); $this->putByte($this->headYaw / (360.0 / 256));
} }
public function handle(PocketEditionNetworkSession $session) : bool{ public function handle(NetworkSession $session) : bool{
return $session->handleMoveEntity($this); return $session->handleMoveEntity($this);
} }

8
src/pocketmine/network/protocol/MovePlayerPacket.php → src/pocketmine/network/mcpe/protocol/MovePlayerPacket.php
View File

@ -19,15 +19,15 @@
* *
*/ */
namespace pocketmine\network\protocol; namespace pocketmine\network\mcpe\protocol;
#include <rules/DataPacket.h> #include <rules/DataPacket.h>
use pocketmine\network\PocketEditionNetworkSession; use pocketmine\network\mcpe\NetworkSession;
class MovePlayerPacket extends DataPacket{ class MovePlayerPacket extends DataPacket{
const NETWORK_ID = Info::MOVE_PLAYER_PACKET; const NETWORK_ID = ProtocolInfo::MOVE_PLAYER_PACKET;
const MODE_NORMAL = 0; const MODE_NORMAL = 0;
const MODE_RESET = 1; const MODE_RESET = 1;
@ -64,7 +64,7 @@ class MovePlayerPacket extends DataPacket{
$this->putBool($this->onGround); $this->putBool($this->onGround);
} }
public function handle(PocketEditionNetworkSession $session) : bool{ public function handle(NetworkSession $session) : bool{
return $session->handleMovePlayer($this); return $session->handleMovePlayer($this);
} }

8
src/pocketmine/network/protocol/PlayStatusPacket.php → src/pocketmine/network/mcpe/protocol/PlayStatusPacket.php
View File

@ -19,15 +19,15 @@
* *
*/ */
namespace pocketmine\network\protocol; namespace pocketmine\network\mcpe\protocol;
#include <rules/DataPacket.h> #include <rules/DataPacket.h>
use pocketmine\network\PocketEditionNetworkSession; use pocketmine\network\mcpe\NetworkSession;
class PlayStatusPacket extends DataPacket{ class PlayStatusPacket extends DataPacket{
const NETWORK_ID = Info::PLAY_STATUS_PACKET; const NETWORK_ID = ProtocolInfo::PLAY_STATUS_PACKET;
const LOGIN_SUCCESS = 0; const LOGIN_SUCCESS = 0;
const LOGIN_FAILED_CLIENT = 1; const LOGIN_FAILED_CLIENT = 1;
@ -47,7 +47,7 @@ class PlayStatusPacket extends DataPacket{
$this->putInt($this->status); $this->putInt($this->status);
} }
public function handle(PocketEditionNetworkSession $session) : bool{ public function handle(NetworkSession $session) : bool{
return $session->handlePlayStatus($this); return $session->handlePlayStatus($this);
} }

8
src/pocketmine/network/protocol/PlayerActionPacket.php → src/pocketmine/network/mcpe/protocol/PlayerActionPacket.php
View File

@ -19,15 +19,15 @@
* *
*/ */
namespace pocketmine\network\protocol; namespace pocketmine\network\mcpe\protocol;
#include <rules/DataPacket.h> #include <rules/DataPacket.h>
use pocketmine\network\PocketEditionNetworkSession; use pocketmine\network\mcpe\NetworkSession;
class PlayerActionPacket extends DataPacket{ class PlayerActionPacket extends DataPacket{
const NETWORK_ID = Info::PLAYER_ACTION_PACKET; const NETWORK_ID = ProtocolInfo::PLAYER_ACTION_PACKET;
const ACTION_START_BREAK = 0; const ACTION_START_BREAK = 0;
const ACTION_ABORT_BREAK = 1; const ACTION_ABORT_BREAK = 1;
@ -69,7 +69,7 @@ class PlayerActionPacket extends DataPacket{
$this->putVarInt($this->face); $this->putVarInt($this->face);
} }
public function handle(PocketEditionNetworkSession $session) : bool{ public function handle(NetworkSession $session) : bool{
return $session->handlePlayerAction($this); return $session->handlePlayerAction($this);
} }

8
src/pocketmine/network/protocol/PlayerFallPacket.php → src/pocketmine/network/mcpe/protocol/PlayerFallPacket.php
View File

@ -19,15 +19,15 @@
* *
*/ */
namespace pocketmine\network\protocol; namespace pocketmine\network\mcpe\protocol;
#include <rules/DataPacket.h> #include <rules/DataPacket.h>
use pocketmine\network\PocketEditionNetworkSession; use pocketmine\network\mcpe\NetworkSession;
class PlayerFallPacket extends DataPacket{ class PlayerFallPacket extends DataPacket{
const NETWORK_ID = Info::PLAYER_FALL_PACKET; const NETWORK_ID = ProtocolInfo::PLAYER_FALL_PACKET;
public $fallDistance; public $fallDistance;
@ -39,7 +39,7 @@ class PlayerFallPacket extends DataPacket{
} }
public function handle(PocketEditionNetworkSession $session) : bool{ public function handle(NetworkSession $session) : bool{
return $session->handlePlayerFall($this); return $session->handlePlayerFall($this);
} }
} }

8
src/pocketmine/network/protocol/PlayerInputPacket.php → src/pocketmine/network/mcpe/protocol/PlayerInputPacket.php
View File

@ -19,15 +19,15 @@
* *
*/ */
namespace pocketmine\network\protocol; namespace pocketmine\network\mcpe\protocol;
#include <rules/DataPacket.h> #include <rules/DataPacket.h>
use pocketmine\network\PocketEditionNetworkSession; use pocketmine\network\mcpe\NetworkSession;
class PlayerInputPacket extends DataPacket{ class PlayerInputPacket extends DataPacket{
const NETWORK_ID = Info::PLAYER_INPUT_PACKET; const NETWORK_ID = ProtocolInfo::PLAYER_INPUT_PACKET;
public $motionX; public $motionX;
public $motionY; public $motionY;
@ -45,7 +45,7 @@ class PlayerInputPacket extends DataPacket{
} }
public function handle(PocketEditionNetworkSession $session) : bool{ public function handle(NetworkSession $session) : bool{
return $session->handlePlayerInput($this); return $session->handlePlayerInput($this);
} }

Some files were not shown because too many files have changed in this diff Show More