Skip to content

Update the plugin to PM4 #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
xLordShadow wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update the plugin to PM4 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion plugin.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: RPSolution
main: emretr1\rpsolution\Main
version: 1.0
api: 3.11.4
api: [4.0.0]
author: EmreTr1
description: A temporary solution for a client bug about loading large MB resource packs in PocketMine-MP
209 changes: 104 additions & 105 deletions src/emretr1/rpsolution/Main.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,123 +5,122 @@
namespace emretr1\rpsolution;

use pocketmine\event\server\DataPacketReceiveEvent;
use pocketmine\network\mcpe\NetworkSession;
use pocketmine\network\mcpe\protocol\ClientboundPacket;
use pocketmine\network\mcpe\protocol\DataPacket;
use pocketmine\network\mcpe\protocol\ResourcePackChunkDataPacket;
use pocketmine\network\mcpe\protocol\ResourcePackChunkRequestPacket;
use pocketmine\network\mcpe\protocol\ResourcePackClientResponsePacket;
use pocketmine\network\mcpe\protocol\ResourcePackDataInfoPacket;
use pocketmine\Player;
use pocketmine\network\mcpe\protocol\types\resourcepacks\ResourcePackType;
use pocketmine\player\Player;
use pocketmine\plugin\PluginBase;
use pocketmine\event\Listener;
use pocketmine\resourcepacks\ResourcePack;
use pocketmine\scheduler\ClosureTask;

class Main extends PluginBase implements Listener{
/** @var PackSendEntry[] */
public static $packSendQueue = [];

public function onEnable(){
$this->getServer()->getPluginManager()->registerEvents($this, $this);
$this->getScheduler()->scheduleRepeatingTask(new ClosureTask(function (int $currentTick) : void{
foreach(self::$packSendQueue as $entry){
$entry->tick($currentTick);
}
}), 0);
}

public function getRpChunkSize() : int{
return (int) $this->getConfig()->get("rp-chunk-size", 524288);
}

public function getRpChunkSendInterval() : int{
return (int) $this->getConfig()->get("rp-chunk-send-interval", 30);
}

public function onPacketReceive(DataPacketReceiveEvent $event){
$player = $event->getPlayer();
$packet = $event->getPacket();
if($packet instanceof ResourcePackClientResponsePacket){
if($packet->status === ResourcePackClientResponsePacket::STATUS_SEND_PACKS){
$event->setCancelled(true);

$manager = $this->getServer()->getResourcePackManager();

self::$packSendQueue[$player->getName()] = $entry = new PackSendEntry($player);
$entry->setSendInterval($this->getRpChunkSendInterval());

foreach($packet->packIds as $uuid){
//dirty hack for mojang's dirty hack for versions
$splitPos = strpos($uuid, "_");
if($splitPos !== false){
$uuid = substr($uuid, 0, $splitPos);
}

$pack = $manager->getPackById($uuid);
if(!($pack instanceof ResourcePack)){
//Client requested a resource pack but we don't have it available on the server
$player->close("", "disconnectionScreen.resourcePack", true);
$this->getServer()->getLogger()->debug("Got a resource pack request for unknown pack with UUID " . $uuid . ", available packs: " . implode(", ", $manager->getPackIdList()));

return false;
}

$pk = new ResourcePackDataInfoPacket();
$pk->packId = $pack->getPackId();
$pk->maxChunkSize = $this->getRpChunkSize();
$pk->chunkCount = (int) ceil($pack->getPackSize() / $pk->maxChunkSize);
$pk->compressedPackSize = $pack->getPackSize();
$pk->sha256 = $pack->getSha256();
$player->sendDataPacket($pk);

for($i = 0; $i < $pk->chunkCount; $i++){
$pk2 = new ResourcePackChunkDataPacket();
$pk2->packId = $pack->getPackId();
$pk2->chunkIndex = $i;
$pk2->data = $pack->getPackChunk($pk->maxChunkSize * $i, $pk->maxChunkSize);
$pk2->progress = ($pk->maxChunkSize * $i);

$entry->addPacket($pk2);
}
}
}
}elseif($packet instanceof ResourcePackChunkRequestPacket){
$event->setCancelled(true); // dont rely on client
}
}
/** @var PackSendEntry[] */
public static $packSendQueue = [];

public function onEnable() : void{
$this->getServer()->getPluginManager()->registerEvents($this, $this);
$this->getScheduler()->scheduleRepeatingTask(new ClosureTask(function() : void{
foreach(self::$packSendQueue as $entry){
$entry->tick();
}
}), 0);
}

public function getRpChunkSize() : int{
return (int) $this->getConfig()->get("rp-chunk-size", 524288);
}

public function getRpChunkSendInterval() : int{
return (int) $this->getConfig()->get("rp-chunk-send-interval", 30);
}

public function onPacketReceive(DataPacketReceiveEvent $event) : void{
$player = $event->getOrigin();
$packet = $event->getPacket();

if($packet instanceof ResourcePackClientResponsePacket){
if($packet->status === ResourcePackClientResponsePacket::STATUS_SEND_PACKS){
$event->cancel();

$manager = $this->getServer()->getResourcePackManager();

self::$packSendQueue[$player->getDisplayName()] = $entry = new PackSendEntry($event->getOrigin());
$entry->setSendInterval($this->getRpChunkSendInterval());

foreach($packet->packIds as $uuid){
//dirty hack for mojang's dirty hack for versions
$splitPos = strpos($uuid, "_");
if($splitPos !== false){
$uuid = substr($uuid, 0, $splitPos);
}

$pack = $manager->getPackById($uuid);
if(!($pack instanceof ResourcePack)){
//Client requested a resource pack but we don't have it available on the server
$player->onClientDisconnect("disconnectionScreen.resourcePack");
$this->getServer()->getLogger()->debug("Got a resource pack request for unknown pack with UUID " . $uuid . ", available packs: " . implode(", ", $manager->getPackIdList()));

return;
}

$pk = ResourcePackDataInfoPacket::create($pack->getPackId(), $this->getRpChunkSize(), (int) ceil($pack->getPackSize() / $this->getRpChunkSize()), $pack->getPackSize(), $pack->getSha256(), false, ResourcePackType::RESOURCES);
$player->sendDataPacket($pk);

for($i = 0; $i < $pk->chunkCount; $i++){
$pk2 = ResourcePackChunkDataPacket::create($pack->getPackId(), $i, ($pk->maxChunkSize * $i), $pack->getPackChunk($pk->maxChunkSize * $i, $pk->maxChunkSize));
$entry->addPacket($pk2);
}
}
}
}elseif($packet instanceof ResourcePackChunkRequestPacket){
$event->cancel(); // dont rely on client
}
}
}

class PackSendEntry{
/** @var DataPacket[] */
protected $packets = [];
/** @var int */
protected $sendInterval = 30;
/** @var Player */
protected $player;

public function __construct(Player $player){
$this->player = $player;
}

public function addPacket(DataPacket $packet) : void{
$this->packets[] = $packet;
}

public function setSendInterval(int $value) : void{
$this->sendInterval = $value;
}

public function tick(int $tick) : void{
if(!$this->player->isConnected()){
unset(Main::$packSendQueue[$this->player->getName()]);
return;
}

if(($tick % $this->sendInterval) === 0){
if($next = array_shift($this->packets)){
$this->player->sendDataPacket($next);
}else{
unset(Main::$packSendQueue[$this->player->getName()]);
}
}
}
/** @var DataPacket[] */
protected $packets = [];
/** @var int */
protected $sendInterval = 30;
/** @var int */
protected $currentTick = 0;
/** @var NetworkSession */
protected $player;

public function __construct(NetworkSession $player){
$this->player = $player;
}

public function addPacket(DataPacket $packet) : void{
$this->packets[] = $packet;
}

public function setSendInterval(int $value) : void{
$this->sendInterval = $value;
}

public function tick() : void{
if(!$this->player->isConnected()){
unset(Main::$packSendQueue[$this->player->getDisplayName()]);
return;
}
$this->currentTick++;

if(($this->currentTick % $this->sendInterval) === 0){
if($next = array_shift($this->packets)){
if($next instanceof ClientboundPacket){
$this->player->sendDataPacket($next);
}
}else{
unset(Main::$packSendQueue[$this->player->getDisplayName()]);
}
}
}
}