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

Clean up some EnchantmentList mess

Browse Source
This commit is contained in:
Dylan K. Taylor 2016-11-08 21:44:43 +00:00
parent ea7313779e
commit 1d876e30c8
1 changed files with 1 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/pocketmine/network/protocol/CraftingDataPacket.php
View File

@ -28,7 +28,6 @@ use pocketmine\inventory\FurnaceRecipe;
use pocketmine\inventory\MultiRecipe; use pocketmine\inventory\MultiRecipe;
use pocketmine\inventory\ShapedRecipe; use pocketmine\inventory\ShapedRecipe;
use pocketmine\inventory\ShapelessRecipe; use pocketmine\inventory\ShapelessRecipe;
use pocketmine\item\enchantment\EnchantmentList;
use pocketmine\item\Item; use pocketmine\item\Item;
use pocketmine\utils\BinaryStream; use pocketmine\utils\BinaryStream;
@ -39,7 +38,6 @@ class CraftingDataPacket extends DataPacket{
const ENTRY_SHAPED = 1; const ENTRY_SHAPED = 1;
const ENTRY_FURNACE = 2; const ENTRY_FURNACE = 2;
const ENTRY_FURNACE_DATA = 3; const ENTRY_FURNACE_DATA = 3;
const ENTRY_ENCHANT_LIST = -1; //Deprecated
const ENTRY_MULTI = 4; const ENTRY_MULTI = 4;
/** @var object[] */ /** @var object[] */
@ -115,9 +113,8 @@ class CraftingDataPacket extends DataPacket{
return self::writeShapedRecipe($entry, $stream); return self::writeShapedRecipe($entry, $stream);
}elseif($entry instanceof FurnaceRecipe){ }elseif($entry instanceof FurnaceRecipe){
return self::writeFurnaceRecipe($entry, $stream); return self::writeFurnaceRecipe($entry, $stream);
}elseif($entry instanceof EnchantmentList){
return self::writeEnchantList($entry, $stream);
} }
//TODO: add MultiRecipe
return -1; return -1;
} }
@ -169,26 +166,6 @@ class CraftingDataPacket extends DataPacket{
} }
} }
private static function writeEnchantList(EnchantmentList $list, BinaryStream $stream){
//TODO: new recipe type 4 (not enchanting recipe anymore)
return -1;
/*
$stream->putByte($list->getSize());
for($i = 0; $i < $list->getSize(); ++$i){
$entry = $list->getSlot($i);
$stream->putUnsignedVarInt($entry->getCost());
$stream->putUnsignedVarInt(count($entry->getEnchantments()));
foreach($entry->getEnchantments() as $enchantment){
$stream->putUnsignedVarInt($enchantment->getId());
$stream->putUnsignedVarInt($enchantment->getLevel());
}
$stream->putString($entry->getRandomName());
}
return CraftingDataPacket::ENTRY_ENCHANT_LIST;
*/
}
public function addShapelessRecipe(ShapelessRecipe $recipe){ public function addShapelessRecipe(ShapelessRecipe $recipe){
$this->entries[] = $recipe; $this->entries[] = $recipe;
} }
@ -201,10 +178,6 @@ class CraftingDataPacket extends DataPacket{
$this->entries[] = $recipe; $this->entries[] = $recipe;
} }
public function addEnchantList(EnchantmentList $list){
$this->entries[] = $list;
}
public function encode(){ public function encode(){
$this->reset(); $this->reset();
$this->putUnsignedVarInt(count($this->entries)); $this->putUnsignedVarInt(count($this->entries));