mirror of
https://github.com/pmmp/PocketMine-MP.git
synced 2025-07-12 21:05:12 +00:00
Added decode for CraftingDataPacket and shell for MultiRecipe
This commit is contained in:
parent
e3c900e071
commit
bee6c546dc
34
src/pocketmine/inventory/MultiRecipe.php
Normal file
34
src/pocketmine/inventory/MultiRecipe.php
Normal file
@ -0,0 +1,34 @@
|
|||||||
|
<?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\inventory;
|
||||||
|
|
||||||
|
use pocketmine\utils\UUID;
|
||||||
|
|
||||||
|
class MultiRecipe{
|
||||||
|
|
||||||
|
private $uuid;
|
||||||
|
|
||||||
|
public function __construct(UUID $uuid){
|
||||||
|
$this->uuid = $uuid;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
@ -25,9 +25,11 @@ namespace pocketmine\network\protocol;
|
|||||||
|
|
||||||
|
|
||||||
use pocketmine\inventory\FurnaceRecipe;
|
use pocketmine\inventory\FurnaceRecipe;
|
||||||
|
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\enchantment\EnchantmentList;
|
||||||
|
use pocketmine\item\Item;
|
||||||
use pocketmine\utils\BinaryStream;
|
use pocketmine\utils\BinaryStream;
|
||||||
|
|
||||||
class CraftingDataPacket extends DataPacket{
|
class CraftingDataPacket extends DataPacket{
|
||||||
@ -37,12 +39,83 @@ 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 = 4;
|
const ENTRY_ENCHANT_LIST = -1; //Deprecated
|
||||||
|
const ENTRY_MULTI = 4;
|
||||||
|
|
||||||
/** @var object[] */
|
/** @var object[] */
|
||||||
public $entries = [];
|
public $entries = [];
|
||||||
public $cleanRecipes = false;
|
public $cleanRecipes = false;
|
||||||
|
|
||||||
|
public function clean(){
|
||||||
|
$this->entries = [];
|
||||||
|
return parent::clean();
|
||||||
|
}
|
||||||
|
|
||||||
|
public function decode(){
|
||||||
|
$count = $this->getUnsignedVarInt();
|
||||||
|
for($i = 0; $i < $count; ++$i){
|
||||||
|
$recipeType = $this->getUnsignedVarInt();
|
||||||
|
switch($recipeType){
|
||||||
|
case self::ENTRY_SHAPELESS:
|
||||||
|
$ingredientCount = $this->getUnsignedVarInt();
|
||||||
|
/** @var Item */
|
||||||
|
$ingredients = [];
|
||||||
|
for($j = 0; $j < $ingredientCount; ++$j){
|
||||||
|
$ingredients[] = $this->getSlot();
|
||||||
|
}
|
||||||
|
$resultCount = $this->getUnsignedVarInt();
|
||||||
|
$results = [];
|
||||||
|
for($k = 0; $k < $resultCount; ++$k){
|
||||||
|
$results[] = $this->getSlot();
|
||||||
|
}
|
||||||
|
$uuid = $this->getUUID();
|
||||||
|
$recipe = new ShapelessRecipe($results[0]); //ouch...
|
||||||
|
$recipe->setId($uuid);
|
||||||
|
foreach($ingredients as $ingr){
|
||||||
|
$recipe->addIngredient($ingr);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case self::ENTRY_SHAPED:
|
||||||
|
$width = $this->getVarInt();
|
||||||
|
$height = $this->getVarInt();
|
||||||
|
$count = $width * $height;
|
||||||
|
$ingredients = [];
|
||||||
|
for($j = 0; $j < $count; ++$j){
|
||||||
|
$ingredients[] = $this->getSlot();
|
||||||
|
}
|
||||||
|
$resultCount = $this->getUnsignedVarInt();
|
||||||
|
$results = [];
|
||||||
|
for($k = 0; $k < $resultCount; ++$k){
|
||||||
|
$results[] = $this->getSlot();
|
||||||
|
}
|
||||||
|
$uuid = $this->getUUID();
|
||||||
|
$recipe = new ShapedRecipe($results[0], $height, $width); //yes, blatant copy-paste...
|
||||||
|
$recipe->setId($uuid);
|
||||||
|
foreach($ingredients as $ingr){
|
||||||
|
$recipe->addIngredient($ingr);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case self::ENTRY_FURNACE:
|
||||||
|
case self::ENTRY_FURNACE_DATA:
|
||||||
|
$inputId = $this->getVarInt();
|
||||||
|
if($recipeType === self::ENTRY_FURNACE_DATA){
|
||||||
|
$inputData = $this->getVarInt();
|
||||||
|
}
|
||||||
|
$result = $this->getSlot();
|
||||||
|
$recipe = new FurnaceRecipe(Item::get($inputId, $inputData ?? null), $result);
|
||||||
|
break;
|
||||||
|
case self::ENTRY_MULTI:
|
||||||
|
$uuid = $this->getUUID();
|
||||||
|
$recipe = new MultiRecipe($uuid);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
throw new \UnexpectedValueException("Unhandled recipe type $recipeType!"); //do not continue attempting to decode
|
||||||
|
}
|
||||||
|
$this->entries[] = $recipe;
|
||||||
|
}
|
||||||
|
//TODO: serialize to json
|
||||||
|
}
|
||||||
|
|
||||||
private static function writeEntry($entry, BinaryStream $stream){
|
private static function writeEntry($entry, BinaryStream $stream){
|
||||||
if($entry instanceof ShapelessRecipe){
|
if($entry instanceof ShapelessRecipe){
|
||||||
return self::writeShapelessRecipe($entry, $stream);
|
return self::writeShapelessRecipe($entry, $stream);
|
||||||
@ -140,15 +213,6 @@ class CraftingDataPacket extends DataPacket{
|
|||||||
$this->entries[] = $list;
|
$this->entries[] = $list;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function clean(){
|
|
||||||
$this->entries = [];
|
|
||||||
return parent::clean();
|
|
||||||
}
|
|
||||||
|
|
||||||
public function decode(){
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
public function encode(){
|
public function encode(){
|
||||||
$this->reset();
|
$this->reset();
|
||||||
$this->putUnsignedVarInt(count($this->entries));
|
$this->putUnsignedVarInt(count($this->entries));
|
||||||
|
Loading…
x
Reference in New Issue
Block a user