mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-05-12 00:39:45 +00:00
Code Issues Projects Releases Wiki Activity

crafting: avoid unnecessary recipe mutability

Browse Source
This commit is contained in:
Dylan K. Taylor 2019-07-19 19:11:36 +01:00
parent 556beacdbf
commit 47b120fa0e
3 changed files with 12 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/pocketmine/crafting/FurnaceRecipe.php
View File

@ -42,13 +42,6 @@ class FurnaceRecipe{
$this->ingredient = clone $ingredient; $this->ingredient = clone $ingredient;
} }
/**
* @param Item $item
*/
public function setInput(Item $item) : void{
$this->ingredient = clone $item;
}
/** /**
* @return Item * @return Item
*/ */

23
src/pocketmine/crafting/ShapedRecipe.php
View File

@ -88,7 +88,11 @@ class ShapedRecipe implements CraftingRecipe{
$this->shape = $shape; $this->shape = $shape;
foreach($ingredients as $char => $i){ foreach($ingredients as $char => $i){
$this->setIngredient($char, $i); if(strpos(implode($this->shape), $char) === false){
throw new \InvalidArgumentException("Symbol '$char' does not appear in the recipe shape");
}
$this->ingredientList[$char] = clone $i;
} }
$this->results = array_map(function(Item $item) : Item{ return clone $item; }, $results); $this->results = array_map(function(Item $item) : Item{ return clone $item; }, $results);
@ -118,23 +122,6 @@ class ShapedRecipe implements CraftingRecipe{
return $this->getResults(); return $this->getResults();
} }
/**
* @param string $key
* @param Item $item
*
* @return $this
* @throws \InvalidArgumentException
*/
public function setIngredient(string $key, Item $item){
if(strpos(implode($this->shape), $key) === false){
throw new \InvalidArgumentException("Symbol '$key' does not appear in the recipe shape");
}
$this->ingredientList[$key] = clone $item;
return $this;
}
/** /**
* @return Item[][] * @return Item[][]
*/ */

46
src/pocketmine/crafting/ShapelessRecipe.php
View File

@ -40,7 +40,13 @@ class ShapelessRecipe implements CraftingRecipe{
public function __construct(array $ingredients, array $results){ public function __construct(array $ingredients, array $results){
foreach($ingredients as $item){ foreach($ingredients as $item){
//Ensure they get split up properly //Ensure they get split up properly
$this->addIngredient($item); if(count($this->ingredients) + $item->getCount() > 9){
throw new \InvalidArgumentException("Shapeless recipes cannot have more than 9 ingredients");
}
while($item->getCount() > 0){
$this->ingredients[] = $item->pop();
}
} }
$this->results = array_map(function(Item $item) : Item{ return clone $item; }, $results); $this->results = array_map(function(Item $item) : Item{ return clone $item; }, $results);
@ -54,44 +60,6 @@ class ShapelessRecipe implements CraftingRecipe{
return $this->getResults(); return $this->getResults();
} }
/**
* @param Item $item
*
* @return ShapelessRecipe
*
* @throws \InvalidArgumentException
*/
public function addIngredient(Item $item) : ShapelessRecipe{
if(count($this->ingredients) + $item->getCount() > 9){
throw new \InvalidArgumentException("Shapeless recipes cannot have more than 9 ingredients");
}
while($item->getCount() > 0){
$this->ingredients[] = $item->pop();
}
return $this;
}
/**
* @param Item $item
*
* @return $this
*/
public function removeIngredient(Item $item){
foreach($this->ingredients as $index => $ingredient){
if($item->getCount() <= 0){
break;
}
if($ingredient->equals($item, !$item->hasAnyDamageValue(), $item->hasNamedTag())){
unset($this->ingredients[$index]);
$item->pop();
}
}
return $this;
}
/** /**
* @return Item[] * @return Item[]
*/ */