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

Day 3, part 1

Browse Source
This commit is contained in:
Dylan K. Taylor 2017-08-03 14:57:10 +01:00
parent 63d2b341b9
commit 50dffeb6a1
3 changed files with 63 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/pocketmine/network/mcpe/protocol/InteractPacket.php
View File

@ -31,8 +31,17 @@ use pocketmine\network\mcpe\NetworkSession;
class InteractPacket extends DataPacket{
const NETWORK_ID = ProtocolInfo::INTERACT_PACKET;
/**
* @deprecated
* This action is no longer used as of MCPE 1.2.0.2, this is now handled in InventoryTransactionPacket
*/
const ACTION_RIGHT_CLICK = 1;
/**
* @deprecated
* This action is no longer used as of MCPE 1.2.0.2, this is now handled in InventoryTransactionPacket
*/
const ACTION_LEFT_CLICK = 2;
const ACTION_LEAVE_VEHICLE = 3;
const ACTION_MOUSEOVER = 4;

61
src/pocketmine/network/mcpe/protocol/InventoryTransactionPacket.php
View File

@ -26,6 +26,7 @@ namespace pocketmine\network\mcpe\protocol;
#include <rules/DataPacket.h>
use pocketmine\network\mcpe\NetworkSession;
use pocketmine\network\mcpe\protocol\types\inventory\source\InventorySource;
class InventoryTransactionPacket extends DataPacket{
const NETWORK_ID = ProtocolInfo::INVENTORY_TRANSACTION_PACKET;
@ -34,11 +35,50 @@ class InventoryTransactionPacket extends DataPacket{
const TYPE_USE_ITEM_ON_ENTITY = 3;
const TYPE_RELEASE_ITEM = 4;
const USE_ITEM_ACTION_CLICK_BLOCK = 0;
const USE_ITEM_ACTION_CLICK_AIR = 1;
const USE_ITEM_ACTION_BREAK_BLOCK = 2;
const RELEASE_ITEM_ACTION_RELEASE = 0; //bow shoot
const RELEASE_ITEM_ACTION_CONSUME = 1; //eat food, drink potion
//TODO: use-item on entity interaction action types
const SOURCE_CONTAINER = 0;
const SOURCE_WORLD = 2;
const SOURCE_WORLD = 2; //drop/pickup item entity
const SOURCE_CREATIVE = 3;
const SOURCE_CRAFTING = 99999;
const SOURCE_TODO = 99999;
/**
* These identifiers are used for special slot types for transaction/inventory types that are not yet implemented.
* Expect these to change in the future.
*/
const SOURCE_TYPE_CRAFTING_ADD_INGREDIENT = -2;
const SOURCE_TYPE_CRAFTING_REMOVE_INGREDIENT = -3;
const SOURCE_TYPE_CRAFTING_RESULT = -4;
const SOURCE_TYPE_ANVIL_INPUT = -10;
const SOURCE_TYPE_ANVIL_MATERIAL = -11;
const SOURCE_TYPE_ANVIL_RESULT = -12;
const SOURCE_TYPE_ANVIL_OUTPUT = -13;
const SOURCE_TYPE_ENCHANT_INPUT = -15;
const SOURCE_TYPE_ENCHANT_MATERIAL = -16;
const SOURCE_TYPE_ENCHANT_OUTPUT = -17;
const SOURCE_TYPE_TRADING_INPUT_1 = -20;
const SOURCE_TYPE_TRADING_INPUT_2 = -21;
const SOURCE_TYPE_TRADING_USE_INPUTS = -22;
const SOURCE_TYPE_TRADING_OUTPUT = -23;
const SOURCE_TYPE_BEACON = -24;
const SOURCE_TYPE_CONTAINER_DROP_CONTENTS = -100;
public $actions = [];
@ -72,12 +112,18 @@ class InventoryTransactionPacket extends DataPacket{
break;
case self::TYPE_USE_ITEM_ON_ENTITY:
$this->transactionData->entityRuntimeId = $this->getEntityRuntimeId();
$this->transactionData->uvarint1_3 = $this->getUnsignedVarInt();
$this->transactionData->uvarint1_3 = $this->getUnsignedVarInt(); //probably action type, check values
$this->transactionData->hotbarSlot = $this->getVarInt();
$this->transactionData->itemInHand = $this->getSlot();
$this->transactionData->vector1 = $this->getVector3Obj();
$this->transactionData->vector2 = $this->getVector3Obj();
break;
case self::TYPE_RELEASE_ITEM:
$this->transactionData->releaseItemActionType = $this->getUnsignedVarInt();
$this->transactionData->hotbarSlot = $this->getVarInt();
$this->transactionData->itemInHand = $this->getSlot();
$this->transactionData->headPos = $this->getVector3Obj();
break;
default:
throw new \UnexpectedValueException("Unknown transaction type $type");
@ -107,13 +153,12 @@ class InventoryTransactionPacket extends DataPacket{
switch($bucket->sourceType){
case self::SOURCE_CONTAINER:
$bucket->containerId = $this->getVarInt();
$bucket->field_2 = 0;
break;
case 1: //???
$bucket->containerId = -1;
$bucket->field_2 = 0;
break;
case 1:
break; //unused
case self::SOURCE_WORLD:
$bucket->containerId = -1;
$bucket->field_2 = $this->getUnsignedVarInt();
@ -122,7 +167,7 @@ class InventoryTransactionPacket extends DataPacket{
$bucket->containerId = -1;
$bucket->field_2 = 0;
break;
case self::SOURCE_CRAFTING:
case self::SOURCE_TODO:
$bucket->containerId = $this->getVarInt();
$bucket->field_2 = 0;
break;

1
src/pocketmine/network/mcpe/protocol/types/ContainerIds.php
View File

@ -34,5 +34,6 @@ interface ContainerIds{
const CREATIVE = 121;
const HOTBAR = 122;
const FIXED_INVENTORY = 123;
const CURSOR = 124;
}