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

ItemFactory: Get rid of $multiple crap

Browse Source 
this is required in a specialized format, which doesn't make any sense. Plugins with multiple packed item formats should parse them themselves.
This commit is contained in:
Dylan K. Taylor 2018-12-28 11:55:52 +00:00
parent cf20f0e23a
commit f64cef7eb6
2 changed files with 24 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/pocketmine/item/Item.php
View File

@ -93,17 +93,17 @@ class Item implements ItemIds, \JsonSerializable{
} }
/** /**
* Tries to parse the specified string into Item ID/meta identifiers, and returns Item instances it created. * Tries to parse the specified string into Item types.
* *
* This function redirects to {@link ItemFactory#fromString}. * This function redirects to {@link ItemFactory#fromString}.
* *
* @param string $str * @param string $str
* @param bool $multiple
* *
* @return Item[]|Item * @return Item
* @throws \InvalidArgumentException
*/ */
public static function fromString(string $str, bool $multiple = false){ public static function fromString(string $str) : Item{
return ItemFactory::fromString($str, $multiple); return ItemFactory::fromString($str);
} }

51
src/pocketmine/item/ItemFactory.php
View File

@ -360,51 +360,38 @@ class ItemFactory{
} }
/** /**
* Tries to parse the specified string into Item ID/meta identifiers, and returns Item instances it created. * Tries to parse the specified string into Item types.
* *
* Example accepted formats: * Example accepted formats:
* - `diamond_pickaxe:5` * - `diamond_pickaxe:5`
* - `minecraft:string` * - `minecraft:string`
* - `351:4 (lapis lazuli ID:meta)` * - `351:4 (lapis lazuli ID:meta)`
* *
* If multiple item instances are to be created, their identifiers must be comma-separated, for example:
* `diamond_pickaxe,wooden_shovel:18,iron_ingot`
*
* @param string $str * @param string $str
* @param bool $multiple
* *
* @return Item[]|Item * @return Item
* *
* @throws \InvalidArgumentException if the given string cannot be parsed as an item identifier * @throws \InvalidArgumentException if the given string cannot be parsed as an item identifier
*/ */
public static function fromString(string $str, bool $multiple = false){ public static function fromString(string $str) : Item{
if($multiple){ $b = explode(":", str_replace([" ", "minecraft:"], ["_", ""], trim($str)));
$blocks = []; if(!isset($b[1])){
foreach(explode(",", $str) as $b){ $meta = 0;
$blocks[] = self::fromString($b, false); }elseif(is_numeric($b[1])){
} $meta = (int) $b[1];
return $blocks;
}else{ }else{
$b = explode(":", str_replace([" ", "minecraft:"], ["_", ""], trim($str))); throw new \InvalidArgumentException("Unable to parse \"" . $b[1] . "\" from \"" . $str . "\" as a valid meta value");
if(!isset($b[1])){
$meta = 0;
}elseif(is_numeric($b[1])){
$meta = (int) $b[1];
}else{
throw new \InvalidArgumentException("Unable to parse \"" . $b[1] . "\" from \"" . $str . "\" as a valid meta value");
}
if(is_numeric($b[0])){
$item = self::get((int) $b[0], $meta);
}elseif(defined(ItemIds::class . "::" . strtoupper($b[0]))){
$item = self::get(constant(ItemIds::class . "::" . strtoupper($b[0])), $meta);
}else{
throw new \InvalidArgumentException("Unable to resolve \"" . $str . "\" to a valid item");
}
return $item;
} }
if(is_numeric($b[0])){
$item = self::get((int) $b[0], $meta);
}elseif(defined(ItemIds::class . "::" . strtoupper($b[0]))){
$item = self::get(constant(ItemIds::class . "::" . strtoupper($b[0])), $meta);
}else{
throw new \InvalidArgumentException("Unable to resolve \"" . $str . "\" to a valid item");
}
return $item;
} }
/** /**