Added threaded chunk sending for all formats

src/pocketmine/level/Level.php

@@ -1408,9 +1408,6 @@ class Level implements ChunkManager, Metadatable{
 	}
 
 	public function requestChunk($x, $z, Player $player, $order = LevelProvider::ORDER_ZXY){
-		if($this->blockOrder === $order){
-			$player->sendChunk($x, $z, $this->getNetworkChunk($x, $z));
-		}else{
 		$index = Level::chunkHash($x, $z);
 		if(!isset($this->chunkSendQueue[$index])){
 			$this->chunkSendQueue[$index] = [];
@@ -1418,36 +1415,6 @@ class Level implements ChunkManager, Metadatable{
 
 		$this->chunkSendQueue[$index][spl_object_hash($player)] = $player;
 	}
-	}
-
-	protected function getNetworkChunk($x, $z){
-		$index = Level::chunkHash($x, $z);
-		if(ADVANCED_CACHE == true and ($cache = Cache::get("world:".$this->getID().":" . $index)) !== false){
-			return $cache;
-		}
-
-		$chunk = $this->getChunkAt($x, $z, true);
-		$tiles = "";
-		$nbt = new NBT(NBT::LITTLE_ENDIAN);
-		foreach($chunk->getTiles() as $tile){
-			if($tile instanceof Spawnable){
-				$nbt->setData($tile->getSpawnCompound());
-				$tiles .= $nbt->write();
-			}
-		}
-
-		$biomeColors = "";
-		foreach($chunk->getBiomeColorArray() as $color){
-			$biomeColors .= Binary::writeInt($color);
-		}
-
-		$encoded = zlib_encode(Binary::writeLInt($x) . Binary::writeLInt($z) . $chunk->getBlockIdArray() . $chunk->getBlockDataArray() . $chunk->getBlockSkyLightArray() . $chunk->getBlockLightArray() . $chunk->getBiomeIdArray() . $biomeColors . $tiles, ZLIB_ENCODING_DEFLATE, Level::$COMPRESSION_LEVEL);
-		if(ADVANCED_CACHE == true){
-			Cache::add("world:".$this->getID().":" . $index, $encoded);
-		}
-
-		return $encoded;
-	}
 
 	protected function processChunkRequest(){
 		if(count($this->chunkSendQueue) > 0){
@@ -1467,7 +1434,7 @@ class Level implements ChunkManager, Metadatable{
 					}
 					unset($this->chunkSendQueue[$index]);
 				}else{
-					$task = new ChunkRequestTask($this, $x, $z);
+					$task = $this->provider->requestChunkTask($x, $z);
 					$this->server->getScheduler()->scheduleAsyncTask($task);
 					$this->chunkSendTasks[$index] = true;
 				}

src/pocketmine/level/format/LevelProvider.php

@@ -52,6 +52,16 @@ interface LevelProvider{
 	 */
 	public static function usesChunkSection();
 
+	/**
+	 * Requests a MC: PE network chunk to be sent
+	 *
+	 * @param int $x
+	 * @param int $z
+	 *
+	 * @return \pocketmine\scheduler\AsyncTask
+	 */
+	public function requestChunkTask($x, $z);
+
 	/** @return string */
 	public function getPath();
 

src/pocketmine/level/format/anvil/Anvil.php

@@ -70,6 +70,10 @@ class Anvil extends McRegion{
 		return $isValid;
 	}
 
+	public function requestChunkTask($x, $z){
+		return new ChunkRequestTask($this, $this->getLevel()->getID(), $x, $z);
+	}
+
 	public function loadChunk($chunkX, $chunkZ, $create = false){
 		$index = Level::chunkHash($chunkX, $chunkZ);
 		if(isset($this->chunks[$index])){

src/pocketmine/level/format/anvil/ChunkRequestTask.php

@@ -19,8 +19,9 @@
  *
 */
 
-namespace pocketmine\level;
+namespace pocketmine\level\format\anvil;
 
+use pocketmine\level\Level;
 use pocketmine\nbt\NBT;
 use pocketmine\scheduler\AsyncTask;
 use pocketmine\Server;
@@ -43,11 +44,11 @@ class ChunkRequestTask extends AsyncTask{
 
 	protected $tiles;
 
-	public function __construct(Level $level, $chunkX, $chunkZ){
+	public function __construct(Anvil $level, $levelId, $chunkX, $chunkZ){
-		$this->levelId = $level->getID();
+		$this->levelId = $levelId;
 		$this->chunkX = $chunkX;
 		$this->chunkZ = $chunkZ;
-		$chunk = $level->getChunkAt($chunkX, $chunkZ, true);
+		$chunk = $level->getChunk($chunkX, $chunkZ, true);
 		$this->biomeIds = $chunk->getBiomeIdArray();
 		$this->biomeColors = $chunk->getBiomeColorArray();
 

src/pocketmine/level/format/mcregion/ChunkRequestTask.php

@@ -0,0 +1,120 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+*/
+
+namespace pocketmine\level\format\mcregion;
+
+use pocketmine\level\Level;
+use pocketmine\nbt\NBT;
+use pocketmine\scheduler\AsyncTask;
+use pocketmine\Server;
+use pocketmine\tile\Spawnable;
+use pocketmine\utils\Binary;
+
+class ChunkRequestTask extends AsyncTask{
+
+	protected $levelId;
+	protected $chunkX;
+	protected $chunkZ;
+	protected $compressionLevel;
+
+	protected $blocks;
+	protected $data;
+	protected $skyLight;
+	protected $blockLight;
+
+	/** @var string[256] */
+	protected $biomeIds;
+	/** @var int[] */
+	protected $biomeColors;
+
+	protected $tiles;
+
+	public function __construct(McRegion $level, $levelId, $chunkX, $chunkZ){
+		$this->levelId = $levelId;
+		$this->chunkX = $chunkX;
+		$this->chunkZ = $chunkZ;
+		$chunk = $level->getChunk($chunkX, $chunkZ, true);
+		$this->blocks = $chunk->getBlockIdArray();
+		$this->data = $chunk->getBlockDataArray();
+		$this->skyLight = $chunk->getBlockSkyLightArray();
+		$this->blockLight = $chunk->getBlockLightArray();
+		$this->biomeIds = $chunk->getBiomeIdArray();
+		$this->biomeColors = $chunk->getBiomeColorArray();
+
+		$tiles = "";
+		$nbt = new NBT(NBT::LITTLE_ENDIAN);
+		foreach($chunk->getTiles() as $tile){
+			if($tile instanceof Spawnable){
+				$nbt->setData($tile->getSpawnCompound());
+				$tiles .= $nbt->write();
+			}
+		}
+
+		$this->tiles = $tiles;
+
+		$this->compressionLevel = Level::$COMPRESSION_LEVEL;
+
+	}
+
+	public function onRun(){
+		$biomeColors = "";
+
+		foreach($this->biomeColors as $color){
+			$biomeColors .= Binary::writeInt($color);
+		}
+
+		$ordered = zlib_encode(Binary::writeLInt($this->chunkX) . Binary::writeLInt($this->chunkZ) . $this->blocks . $this->data . $this->skyLight . $this->blockLight . $this->biomeIds . $biomeColors . $this->tiles, ZLIB_ENCODING_DEFLATE, $this->compressionLevel);
+
+		$this->setResult($ordered);
+	}
+
+	public function getColumn(&$data, $x, $z){
+		$i = ($z << 4) + $x;
+		$column = "";
+		for($y = 0; $y < 128; ++$y){
+			$column .= $data{($y << 8) + $i};
+		}
+		return $column;
+	}
+
+	public function getHalfColumn(&$data, $x, $z){
+		$i = ($z << 3) + ($x >> 1);
+		$column = "";
+		if(($x & 1) === 0){
+			for($y = 0; $y < 128; $y += 2){
+				$column .= ($data{($y << 7) + $i} & "\x0f") | chr((ord($data{(($y + 1) << 7) + $i}) & 0x0f) << 4);
+			}
+		}else{
+			for($y = 0; $y < 128; $y += 2){
+				$column .= chr((ord($data{($y << 7) + $i}) & 0xf0) >> 4) | ($data{(($y + 1) << 7) + $i} & "\xf0");
+			}
+		}
+		return $column;
+	}
+
+	public function onCompletion(Server $server){
+		$level = $server->getLevel($this->levelId);
+		if($level instanceof Level and $this->hasResult()){
+			$level->chunkRequestCallback($this->chunkX, $this->chunkZ, $this->getResult());
+		}
+	}
+
+}

src/pocketmine/level/format/mcregion/McRegion.php

@@ -104,6 +104,10 @@ class McRegion extends BaseLevelProvider{
 		$z = $chunkZ >> 5;
 	}
 
+	public function requestChunkTask($x, $z){
+		return new ChunkRequestTask($this, $this->getLevel()->getID(), $x, $z);
+	}
+
 	public function unloadChunks(){
 		$this->chunks = [];
 	}