From 44348c84a402519d41dfab90d6d860ed01e85493 Mon Sep 17 00:00:00 2001 From: catgirl <137518916+ccatgirl@users.noreply.github.com> Date: Tue, 8 Jul 2025 10:00:09 -0500 Subject: [PATCH 1/3] Add reliability enums --- src/Player.php | 26 ++++++++++++------------- src/network/raknet/RakNetCodec.php | 20 +++++++++---------- src/network/raknet/RakNetDataPacket.php | 2 +- src/network/raknet/RakNetInfo.php | 9 +++++++++ 4 files changed, 33 insertions(+), 24 deletions(-) diff --git a/src/Player.php b/src/Player.php index 5eaf9b70..5320afdd 100755 --- a/src/Player.php +++ b/src/Player.php @@ -469,7 +469,7 @@ class Player{ } $packet->messageIndex = $this->counter[3]++; - $packet->reliability = 2; + $packet->reliability = RakNetInfo::RELIABILITY_RELIABLE; @$this->buffer->data[] = $packet; $this->bufferLen += 6 + $len; return []; @@ -497,7 +497,7 @@ class Player{ } $packet->messageIndex = $this->counter[3]++; - $packet->reliability = 2; + $packet->reliability = RakNetInfo::RELIABILITY_RELIABLE; $this->send($pk); $this->packetAlwaysRecoverQueue[$pk->seqNumber] = $pk; @@ -519,7 +519,7 @@ class Player{ $pk = new UnknownPacket; $pk->packetID = $pk->pid(); - $pk->reliability = 3; + $pk->reliability = RakNetInfo::RELIABILITY_RELIABLE_ARRANGED; $pk->orderChannel = Player::CHATMESSAGE_ORDER_CHANNEL; $pk->orderIndex = $orderIndex; @@ -556,7 +556,7 @@ class Player{ $pk = new UnknownPacket; $pk->packetID = $pk->pid(); - $pk->reliability = 3; + $pk->reliability = RakNetInfo::RELIABILITY_RELIABLE_ARRANGED; $pk->orderChannel = Player::BLOCKUPDATE_ORDER_CHANNEL; $pk->orderIndex = $orderIndex; @@ -594,7 +594,7 @@ class Player{ $pk = new UnknownPacket; $pk->packetID = $pk->pid(); - $pk->reliability = 3; + $pk->reliability = RakNetInfo::RELIABILITY_RELIABLE_ARRANGED; $pk->orderChannel = Player::ENTITY_ORDER_CHANNEL; $pk->orderIndex = $orderIndex; @@ -634,7 +634,7 @@ class Player{ $pk = new UnknownPacket; $pk->packetID = $pk->pid(); - $pk->reliability = 2; + $pk->reliability = RakNetInfo::RELIABILITY_RELIABLE; $pk->hasSplit = true; $pk->splitCount = $bufCount; $pk->splitID = $bigCnt; @@ -671,7 +671,7 @@ class Player{ $pk = new UnknownPacket; $pk->packetID = $packet->pid(); - $pk->reliability = 2; + $pk->reliability = RakNetInfo::RELIABILITY_RELIABLE; $pk->hasSplit = true; $pk->splitCount = $bufCount; $pk->splitID = $bigCnt; @@ -1700,7 +1700,7 @@ class Player{ } $pk->messageIndex = $this->counter[3]++; - $pk->reliability = 3; + $pk->reliability = RakNetInfo::RELIABILITY_RELIABLE_ARRANGED; $pk->orderChannel = Player::BLOCKUPDATE_ORDER_CHANNEL; $pk->orderIndex = $this->blockUpdateQueueOrderIndex++; @$this->blockUpdateQueue->data[] = $pk; @@ -1745,7 +1745,7 @@ class Player{ $pk->messageIndex = $this->counter[3]++; - $pk->reliability = 3; + $pk->reliability = RakNetInfo::RELIABILITY_RELIABLE_ARRANGED; $pk->orderChannel = Player::ENTITY_ORDER_CHANNEL; $pk->orderIndex = $this->entityDataQueueOrderIndex++; @$this->entityDataQueue->data[] = $pk; @@ -1854,7 +1854,7 @@ class Player{ } if($motionSent){ $motion->messageIndex = 0; //force 0 cuz reliability 0 - $motion->reliability = 1; + $motion->reliability = RakNetInfo::RELIABILITY_UNRELIABLE_SEQUENCED; $motion->orderIndex = $this->entityDataQueueOrderIndex; $motion->orderChannel = self::ENTITY_ORDER_CHANNEL; $motion->seqIndex = $this->entityMovementQueueSeqIndex++; @@ -1862,7 +1862,7 @@ class Player{ } if($moveSent){ $move->messageIndex = 0; - $move->reliability = 1; + $move->reliability = RakNetInfo::RELIABILITY_UNRELIABLE_SEQUENCED; $move->orderIndex = $this->entityDataQueueOrderIndex; $move->orderChannel = self::ENTITY_ORDER_CHANNEL; $move->seqIndex = $this->entityMovementQueueSeqIndex++; @@ -1870,7 +1870,7 @@ class Player{ } if($headSent){ $headyaw->messageIndex = 0; - $headyaw->reliability = 1; + $headyaw->reliability = RakNetInfo::RELIABILITY_UNRELIABLE_SEQUENCED; $headyaw->orderIndex = $this->entityDataQueueOrderIndex; $headyaw->orderChannel = self::ENTITY_ORDER_CHANNEL; $headyaw->seqIndex = $this->entityMovementQueueSeqIndex++; @@ -1985,7 +1985,7 @@ class Player{ if(($this->chatMessagesQueueLength + $len) >= $MTU) $this->sendChatBuffer(); - $packet->reliability = 3; + $packet->reliability = RakNetInfo::RELIABILITY_RELIABLE_ARRANGED; $packet->messageIndex = $this->counter[3]++; $packet->orderChannel = Player::CHATMESSAGE_ORDER_CHANNEL; $packet->orderIndex = $this->chatMessagesOrderIndex++; diff --git a/src/network/raknet/RakNetCodec.php b/src/network/raknet/RakNetCodec.php index b8e5b55b..bf001bb0 100644 --- a/src/network/raknet/RakNetCodec.php +++ b/src/network/raknet/RakNetCodec.php @@ -99,21 +99,21 @@ class RakNetCodec{ public static function encodeDataPacket(RakNetPacket $packet, RakNetDataPacket $pk){ $packet->buffer .= chr(($pk->reliability << 5) | ($pk->hasSplit > 0 ? 0b00010000 : 0)); $packet->buffer .= Utils::writeShort(strlen($pk->buffer) << 3); - if($pk->reliability === 2 - or $pk->reliability === 3 - or $pk->reliability === 4 - or $pk->reliability === 6 - or $pk->reliability === 7){ + if($pk->reliability === RakNetInfo::RELIABILITY_RELIABLE + or $pk->reliability === RakNetInfo::RELIABILITY_RELIABLE_ARRANGED + or $pk->reliability === RakNetInfo::RELIABILITY_RELIABLE_SEQUENCED + or $pk->reliability === RakNetInfo::RELIABILITY_RELIABLE_WITHACKRECEIPT + or $pk->reliability === RakNetInfo::RELIABILITY_RELIABLE_ARRANGED_WITHACKRECEIPT){ $packet->buffer .= Utils::writeLTriad($pk->messageIndex); } - if($pk->reliability == 1 || $pk->reliability == 4){ + if($pk->reliability == RakNetInfo::RELIABILITY_UNRELIABLE_SEQUENCED || $pk->reliability == RakNetInfo::RELIABILITY_RELIABLE_SEQUENCED){ $packet->buffer .= Utils::writeLTriad($pk->seqIndex); } - if($pk->reliability === 1 - or $pk->reliability === 3 - or $pk->reliability === 4 - or $pk->reliability === 7){ + if($pk->reliability === RakNetInfo::RELIABILITY_UNRELIABLE_SEQUENCED + or $pk->reliability === RakNetInfo::RELIABILITY_RELIABLE_ARRANGED + or $pk->reliability === RakNetInfo::RELIABILITY_RELIABLE_SEQUENCED + or $pk->reliability === RakNetInfo::RELIABILITY_RELIABLE_ARRANGED_WITHACKRECEIPT){ $packet->buffer .= Utils::writeLTriad($pk->orderIndex); $packet->buffer .= chr($pk->orderChannel); } diff --git a/src/network/raknet/RakNetDataPacket.php b/src/network/raknet/RakNetDataPacket.php index 8a45a3e5..10d11ee8 100755 --- a/src/network/raknet/RakNetDataPacket.php +++ b/src/network/raknet/RakNetDataPacket.php @@ -3,7 +3,7 @@ abstract class RakNetDataPacket extends stdClass{ public $buffer = b""; - public $reliability = 0; + public $reliability = RakNetInfo::RELIABILITY_UNRELIABLE; public $hasSplit = false; public $messageIndex; public $orderIndex; diff --git a/src/network/raknet/RakNetInfo.php b/src/network/raknet/RakNetInfo.php index 634e2e76..3554b189 100644 --- a/src/network/raknet/RakNetInfo.php +++ b/src/network/raknet/RakNetInfo.php @@ -37,6 +37,15 @@ abstract class RakNetInfo{ const NACK = 0xa0; const ACK = 0xc0; + const RELIABILITY_UNRELIABLE = 0; + const RELIABILITY_UNRELIABLE_SEQUENCED = 1; + const RELIABILITY_RELIABLE = 2; + const RELIABILITY_RELIABLE_ARRANGED = 3; + const RELIABILITY_RELIABLE_SEQUENCED = 4; + const RELIABILITY_UNRELIABLE_WITHACKRECEIPT = 5; + const RELIABILITY_RELIABLE_WITHACKRECEIPT = 6; + const RELIABILITY_RELIABLE_ARRANGED_WITHACKRECEIPT = 7; + public static function isValid($pid){ return match ((int)$pid) { RakNetInfo::UNCONNECTED_PING, RakNetInfo::UNCONNECTED_PING_OPEN_CONNECTIONS, RakNetInfo::OPEN_CONNECTION_REQUEST_1, RakNetInfo::OPEN_CONNECTION_REPLY_1, RakNetInfo::OPEN_CONNECTION_REQUEST_2, RakNetInfo::OPEN_CONNECTION_REPLY_2, RakNetInfo::INCOMPATIBLE_PROTOCOL_VERSION, RakNetInfo::UNCONNECTED_PONG, RakNetInfo::ADVERTISE_SYSTEM, RakNetInfo::DATA_PACKET_0, RakNetInfo::DATA_PACKET_1, RakNetInfo::DATA_PACKET_2, RakNetInfo::DATA_PACKET_3, RakNetInfo::DATA_PACKET_4, RakNetInfo::DATA_PACKET_5, RakNetInfo::DATA_PACKET_6, RakNetInfo::DATA_PACKET_7, RakNetInfo::DATA_PACKET_8, RakNetInfo::DATA_PACKET_9, RakNetInfo::DATA_PACKET_A, RakNetInfo::DATA_PACKET_B, RakNetInfo::DATA_PACKET_C, RakNetInfo::DATA_PACKET_D, RakNetInfo::DATA_PACKET_E, RakNetInfo::DATA_PACKET_F, RakNetInfo::NACK, RakNetInfo::ACK => true, From 421b7b26e13643f43e24ee45db0ffef882dabc5b Mon Sep 17 00:00:00 2001 From: catgirl <137518916+ccatgirl@users.noreply.github.com> Date: Thu, 10 Jul 2025 20:12:47 -0500 Subject: [PATCH 2/3] arranged > ordered --- src/Player.php | 12 ++++++------ src/network/raknet/RakNetCodec.php | 8 ++++---- src/network/raknet/RakNetInfo.php | 14 +++++++------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/Player.php b/src/Player.php index 5320afdd..fad1a285 100755 --- a/src/Player.php +++ b/src/Player.php @@ -519,7 +519,7 @@ class Player{ $pk = new UnknownPacket; $pk->packetID = $pk->pid(); - $pk->reliability = RakNetInfo::RELIABILITY_RELIABLE_ARRANGED; + $pk->reliability = RakNetInfo::RELIABILITY_RELIABLE_ORDERED; $pk->orderChannel = Player::CHATMESSAGE_ORDER_CHANNEL; $pk->orderIndex = $orderIndex; @@ -556,7 +556,7 @@ class Player{ $pk = new UnknownPacket; $pk->packetID = $pk->pid(); - $pk->reliability = RakNetInfo::RELIABILITY_RELIABLE_ARRANGED; + $pk->reliability = RakNetInfo::RELIABILITY_RELIABLE_ORDERED; $pk->orderChannel = Player::BLOCKUPDATE_ORDER_CHANNEL; $pk->orderIndex = $orderIndex; @@ -594,7 +594,7 @@ class Player{ $pk = new UnknownPacket; $pk->packetID = $pk->pid(); - $pk->reliability = RakNetInfo::RELIABILITY_RELIABLE_ARRANGED; + $pk->reliability = RakNetInfo::RELIABILITY_RELIABLE_ORDERED; $pk->orderChannel = Player::ENTITY_ORDER_CHANNEL; $pk->orderIndex = $orderIndex; @@ -1700,7 +1700,7 @@ class Player{ } $pk->messageIndex = $this->counter[3]++; - $pk->reliability = RakNetInfo::RELIABILITY_RELIABLE_ARRANGED; + $pk->reliability = RakNetInfo::RELIABILITY_RELIABLE_ORDERED; $pk->orderChannel = Player::BLOCKUPDATE_ORDER_CHANNEL; $pk->orderIndex = $this->blockUpdateQueueOrderIndex++; @$this->blockUpdateQueue->data[] = $pk; @@ -1745,7 +1745,7 @@ class Player{ $pk->messageIndex = $this->counter[3]++; - $pk->reliability = RakNetInfo::RELIABILITY_RELIABLE_ARRANGED; + $pk->reliability = RakNetInfo::RELIABILITY_RELIABLE_ORDERED; $pk->orderChannel = Player::ENTITY_ORDER_CHANNEL; $pk->orderIndex = $this->entityDataQueueOrderIndex++; @$this->entityDataQueue->data[] = $pk; @@ -1985,7 +1985,7 @@ class Player{ if(($this->chatMessagesQueueLength + $len) >= $MTU) $this->sendChatBuffer(); - $packet->reliability = RakNetInfo::RELIABILITY_RELIABLE_ARRANGED; + $packet->reliability = RakNetInfo::RELIABILITY_RELIABLE_ORDERED; $packet->messageIndex = $this->counter[3]++; $packet->orderChannel = Player::CHATMESSAGE_ORDER_CHANNEL; $packet->orderIndex = $this->chatMessagesOrderIndex++; diff --git a/src/network/raknet/RakNetCodec.php b/src/network/raknet/RakNetCodec.php index bf001bb0..d8803c0e 100644 --- a/src/network/raknet/RakNetCodec.php +++ b/src/network/raknet/RakNetCodec.php @@ -100,10 +100,10 @@ class RakNetCodec{ $packet->buffer .= chr(($pk->reliability << 5) | ($pk->hasSplit > 0 ? 0b00010000 : 0)); $packet->buffer .= Utils::writeShort(strlen($pk->buffer) << 3); if($pk->reliability === RakNetInfo::RELIABILITY_RELIABLE - or $pk->reliability === RakNetInfo::RELIABILITY_RELIABLE_ARRANGED + or $pk->reliability === RakNetInfo::RELIABILITY_RELIABLE_ORDERED or $pk->reliability === RakNetInfo::RELIABILITY_RELIABLE_SEQUENCED or $pk->reliability === RakNetInfo::RELIABILITY_RELIABLE_WITHACKRECEIPT - or $pk->reliability === RakNetInfo::RELIABILITY_RELIABLE_ARRANGED_WITHACKRECEIPT){ + or $pk->reliability === RakNetInfo::RELIABILITY_RELIABLE_ORDERED_WITHACKRECEIPT){ $packet->buffer .= Utils::writeLTriad($pk->messageIndex); } if($pk->reliability == RakNetInfo::RELIABILITY_UNRELIABLE_SEQUENCED || $pk->reliability == RakNetInfo::RELIABILITY_RELIABLE_SEQUENCED){ @@ -111,9 +111,9 @@ class RakNetCodec{ } if($pk->reliability === RakNetInfo::RELIABILITY_UNRELIABLE_SEQUENCED - or $pk->reliability === RakNetInfo::RELIABILITY_RELIABLE_ARRANGED + or $pk->reliability === RakNetInfo::RELIABILITY_RELIABLE_ORDERED or $pk->reliability === RakNetInfo::RELIABILITY_RELIABLE_SEQUENCED - or $pk->reliability === RakNetInfo::RELIABILITY_RELIABLE_ARRANGED_WITHACKRECEIPT){ + or $pk->reliability === RakNetInfo::RELIABILITY_RELIABLE_ORDERED_WITHACKRECEIPT){ $packet->buffer .= Utils::writeLTriad($pk->orderIndex); $packet->buffer .= chr($pk->orderChannel); } diff --git a/src/network/raknet/RakNetInfo.php b/src/network/raknet/RakNetInfo.php index 3554b189..4c25743d 100644 --- a/src/network/raknet/RakNetInfo.php +++ b/src/network/raknet/RakNetInfo.php @@ -38,13 +38,13 @@ abstract class RakNetInfo{ const ACK = 0xc0; const RELIABILITY_UNRELIABLE = 0; - const RELIABILITY_UNRELIABLE_SEQUENCED = 1; - const RELIABILITY_RELIABLE = 2; - const RELIABILITY_RELIABLE_ARRANGED = 3; - const RELIABILITY_RELIABLE_SEQUENCED = 4; - const RELIABILITY_UNRELIABLE_WITHACKRECEIPT = 5; - const RELIABILITY_RELIABLE_WITHACKRECEIPT = 6; - const RELIABILITY_RELIABLE_ARRANGED_WITHACKRECEIPT = 7; + const RELIABILITY_UNRELIABLE_SEQUENCED = 1; + const RELIABILITY_RELIABLE = 2; + const RELIABILITY_RELIABLE_ORDERED = 3; + const RELIABILITY_RELIABLE_SEQUENCED = 4; + const RELIABILITY_UNRELIABLE_WITHACKRECEIPT = 5; + const RELIABILITY_RELIABLE_WITHACKRECEIPT = 6; + const RELIABILITY_RELIABLE_ORDERED_WITHACKRECEIPT = 7; public static function isValid($pid){ return match ((int)$pid) { From 9b0879e4a4b8659020d21783c738938bce031893 Mon Sep 17 00:00:00 2001 From: catgirl <137518916+ccatgirl@users.noreply.github.com> Date: Thu, 10 Jul 2025 20:20:10 -0500 Subject: [PATCH 3/3] whitespace changes --- src/network/raknet/RakNetInfo.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/network/raknet/RakNetInfo.php b/src/network/raknet/RakNetInfo.php index 4c25743d..2e5abf75 100644 --- a/src/network/raknet/RakNetInfo.php +++ b/src/network/raknet/RakNetInfo.php @@ -39,12 +39,12 @@ abstract class RakNetInfo{ const RELIABILITY_UNRELIABLE = 0; const RELIABILITY_UNRELIABLE_SEQUENCED = 1; - const RELIABILITY_RELIABLE = 2; - const RELIABILITY_RELIABLE_ORDERED = 3; - const RELIABILITY_RELIABLE_SEQUENCED = 4; - const RELIABILITY_UNRELIABLE_WITHACKRECEIPT = 5; - const RELIABILITY_RELIABLE_WITHACKRECEIPT = 6; - const RELIABILITY_RELIABLE_ORDERED_WITHACKRECEIPT = 7; + const RELIABILITY_RELIABLE = 2; + const RELIABILITY_RELIABLE_ORDERED = 3; + const RELIABILITY_RELIABLE_SEQUENCED = 4; + const RELIABILITY_UNRELIABLE_WITHACKRECEIPT = 5; + const RELIABILITY_RELIABLE_WITHACKRECEIPT = 6; + const RELIABILITY_RELIABLE_ORDERED_WITHACKRECEIPT = 7; public static function isValid($pid){ return match ((int)$pid) {