diff --git a/src/pocketmine/item/Clownfish.php b/src/pocketmine/item/Clownfish.php new file mode 100644 index 000000000..4cd83e100 --- /dev/null +++ b/src/pocketmine/item/Clownfish.php @@ -0,0 +1,38 @@ +meta === self::FISH_SALMON ? 6 : 5; + return 5; } public function getSaturationRestore() : float{ - return $this->meta === self::FISH_SALMON ? 9.6 : 6; + return 6; } } diff --git a/src/pocketmine/item/CookedMutton.php b/src/pocketmine/item/CookedMutton.php new file mode 100644 index 000000000..889c57d32 --- /dev/null +++ b/src/pocketmine/item/CookedMutton.php @@ -0,0 +1,38 @@ + 40){ + return [ + new EffectInstance(Effect::getEffect(Effect::POISON), 100) + ]; + } + return []; + } +} diff --git a/src/pocketmine/item/Fish.php b/src/pocketmine/item/Pufferfish.php similarity index 54% rename from src/pocketmine/item/Fish.php rename to src/pocketmine/item/Pufferfish.php index a1f9c014a..cef122f93 100644 --- a/src/pocketmine/item/Fish.php +++ b/src/pocketmine/item/Pufferfish.php @@ -26,55 +26,24 @@ namespace pocketmine\item; use pocketmine\entity\Effect; use pocketmine\entity\EffectInstance; -class Fish extends Food{ - public const FISH_FISH = 0; - public const FISH_SALMON = 1; - public const FISH_CLOWNFISH = 2; - public const FISH_PUFFERFISH = 3; - +class Pufferfish extends Food{ public function __construct(int $meta = 0){ - $name = "Raw Fish"; - if($this->meta === self::FISH_SALMON){ - $name = "Raw Salmon"; - }elseif($this->meta === self::FISH_CLOWNFISH){ - $name = "Clownfish"; - }elseif($this->meta === self::FISH_PUFFERFISH){ - $name = "Pufferfish"; - } - parent::__construct(self::RAW_FISH, $meta, $name); + parent::__construct(self::PUFFERFISH, $meta, "Pufferfish"); } public function getFoodRestore() : int{ - if($this->meta === self::FISH_FISH){ - return 2; - }elseif($this->meta === self::FISH_SALMON){ - return 2; - }elseif($this->meta === self::FISH_CLOWNFISH){ - return 1; - }elseif($this->meta === self::FISH_PUFFERFISH){ - return 1; - } - return 0; + return 1; } public function getSaturationRestore() : float{ - if($this->meta === self::FISH_FISH){ - return 0.4; - }elseif($this->meta === self::FISH_SALMON){ - return 0.4; - }elseif($this->meta === self::FISH_CLOWNFISH){ - return 0.2; - }elseif($this->meta === self::FISH_PUFFERFISH){ - return 0.2; - } - return 0; + return 0.2; } public function getAdditionalEffects() : array{ - return $this->meta === self::FISH_PUFFERFISH ? [ + return [ new EffectInstance(Effect::getEffect(Effect::HUNGER), 300, 2), - new EffectInstance(Effect::getEffect(Effect::NAUSEA), 300, 1), - new EffectInstance(Effect::getEffect(Effect::POISON), 1200, 3) - ] : []; + new EffectInstance(Effect::getEffect(Effect::POISON), 1200, 3), + new EffectInstance(Effect::getEffect(Effect::NAUSEA), 300, 1) + ]; } } diff --git a/src/pocketmine/item/RabbitStew.php b/src/pocketmine/item/RabbitStew.php new file mode 100644 index 000000000..acdf635ff --- /dev/null +++ b/src/pocketmine/item/RabbitStew.php @@ -0,0 +1,46 @@ +