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

Split Bucket into multiple classes

Browse Source
This commit is contained in:
Dylan K. Taylor 2018-10-07 14:03:13 +01:00
parent 706082deb1
commit 82c718cff0
4 changed files with 151 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
src/pocketmine/item/Bucket.php
View File

@ -23,102 +23,48 @@ declare(strict_types=1);
namespace pocketmine\item;
use pocketmine\block\Air;
use pocketmine\block\Block;
use pocketmine\block\BlockFactory;
use pocketmine\block\Liquid;
use pocketmine\entity\Living;
use pocketmine\event\player\PlayerBucketEmptyEvent;
use pocketmine\event\player\PlayerBucketFillEvent;
use pocketmine\math\Vector3;
use pocketmine\Player;
class Bucket extends Item implements Consumable{
/** @var int|null */
protected $blockId;
public function __construct(int $id, int $meta, string $name, ?int $blockId){
parent::__construct($id, $meta, $name);
$this->blockId = $blockId;
}
class Bucket extends Item{
public function getMaxStackSize() : int{
return $this->blockId === Block::AIR ? 16 : 1; //empty buckets stack to 16
}
public function getFuelTime() : int{
if($this->blockId === Block::LAVA or $this->blockId === Block::FLOWING_LAVA){
return 20000;
}
return 0;
return 16;
}
public function onActivate(Player $player, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector) : bool{
if($this->blockId === null){
return false;
}
$resultBlock = BlockFactory::get($this->blockId);
//TODO: move this to generic placement logic
if($blockClicked instanceof Liquid and $blockClicked->isSource()){
$stack = clone $this;
$stack->pop();
if($resultBlock instanceof Air){
if($blockClicked instanceof Liquid and $blockClicked->isSource()){
$stack = clone $this;
$stack->pop();
$resultItem = ItemFactory::get(Item::BUCKET, $blockClicked->getFlowingForm()->getId());
$ev = new PlayerBucketFillEvent($player, $blockReplace, $face, $this, $resultItem);
$ev->call();
if(!$ev->isCancelled()){
$player->getLevel()->setBlock($blockClicked, BlockFactory::get(Block::AIR));
$player->getLevel()->broadcastLevelSoundEvent($blockClicked->add(0.5, 0.5, 0.5), $blockClicked->getBucketFillSound());
if($player->isSurvival()){
if($stack->getCount() === 0){
$player->getInventory()->setItemInHand($ev->getItem());
}else{
$player->getInventory()->setItemInHand($stack);
$player->getInventory()->addItem($ev->getItem());
}
}else{
$player->getInventory()->addItem($ev->getItem());
}
return true;
}else{
$player->getInventory()->sendContents($player);
}
}
}elseif($resultBlock instanceof Liquid and $blockReplace->canBeReplaced()){
$ev = new PlayerBucketEmptyEvent($player, $blockReplace, $face, $this, ItemFactory::get(Item::BUCKET));
$resultItem = ItemFactory::get(Item::BUCKET, $blockClicked->getFlowingForm()->getId());
$ev = new PlayerBucketFillEvent($player, $blockReplace, $face, $this, $resultItem);
$ev->call();
if(!$ev->isCancelled()){
$player->getLevel()->setBlock($blockReplace, $resultBlock->getFlowingForm());
$player->getLevel()->broadcastLevelSoundEvent($blockClicked->add(0.5, 0.5, 0.5), $resultBlock->getBucketEmptySound());
$player->getLevel()->setBlock($blockClicked, BlockFactory::get(Block::AIR));
$player->getLevel()->broadcastLevelSoundEvent($blockClicked->add(0.5, 0.5, 0.5), $blockClicked->getBucketFillSound());
if($player->isSurvival()){
$player->getInventory()->setItemInHand($ev->getItem());
if($stack->getCount() === 0){
$player->getInventory()->setItemInHand($ev->getItem());
}else{
$player->getInventory()->setItemInHand($stack);
$player->getInventory()->addItem($ev->getItem());
}
}else{
$player->getInventory()->addItem($ev->getItem());
}
return true;
}else{
$player->getInventory()->sendContents($player);
}
return true;
}
return false;
}
public function getResidue(){
return ItemFactory::get(Item::BUCKET, 0, 1);
}
public function getAdditionalEffects() : array{
return [];
}
public function canBeConsumed() : bool{
return $this->blockId === null; //Milk
}
public function onConsume(Living $consumer){
$consumer->removeAllEffects();
}
}

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

@ -111,12 +111,13 @@ class ItemFactory{
self::registerItem(new GoldenApple());
self::registerItem(new Sign());
self::registerItem(new ItemBlock(Block::OAK_DOOR_BLOCK, 0, Item::OAK_DOOR));
self::registerItem(new Bucket(Item::BUCKET, 0, "Bucket", Block::AIR));
self::registerItem(new Bucket(Item::BUCKET, 1, "Milk Bucket", null)); //TODO: this ought to get its own class, it has completely different behaviour
//TODO: fix metadata for buckets with still liquid in them
//the meta values are intentionally hardcoded because block IDs will change in the future
self::registerItem(new Bucket(Item::BUCKET, 8, "Water Bucket", Block::FLOWING_WATER));
self::registerItem(new Bucket(Item::BUCKET, 10, "Lava Bucket", Block::FLOWING_LAVA));
self::registerItem(new Bucket(Item::BUCKET, 0, "Bucket"));
self::registerItem(new MilkBucket(Item::BUCKET, 1, "Milk Bucket"));
self::registerItem(new LiquidBucket(Item::BUCKET, 8, "Water Bucket", Block::FLOWING_WATER));
self::registerItem(new LiquidBucket(Item::BUCKET, 10, "Lava Bucket", Block::FLOWING_LAVA));
self::registerItem(new Minecart());
//TODO: SADDLE

81
src/pocketmine/item/LiquidBucket.php Normal file
View File

@ -0,0 +1,81 @@
<?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/
*
*
*/
declare(strict_types=1);
namespace pocketmine\item;
use pocketmine\block\Block;
use pocketmine\block\BlockFactory;
use pocketmine\block\Lava;
use pocketmine\block\Liquid;
use pocketmine\event\player\PlayerBucketEmptyEvent;
use pocketmine\math\Vector3;
use pocketmine\Player;
class LiquidBucket extends Item{
/** @var int|null */
protected $liquidId;
public function __construct(int $id, int $meta, string $name, int $liquidId){
parent::__construct($id, $meta, $name);
$this->liquidId = $liquidId;
}
public function getMaxStackSize() : int{
return 1;
}
public function getFuelTime() : int{
if(BlockFactory::get($this->liquidId) instanceof Lava){
return 20000;
}
return 0;
}
public function onActivate(Player $player, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector) : bool{
if(!$blockReplace->canBeReplaced()){
return false;
}
//TODO: move this to generic placement logic
$resultBlock = BlockFactory::get($this->liquidId);
if($resultBlock instanceof Liquid){
$ev = new PlayerBucketEmptyEvent($player, $blockReplace, $face, $this, ItemFactory::get(Item::BUCKET));
$ev->call();
if(!$ev->isCancelled()){
$player->getLevel()->setBlock($blockReplace, $resultBlock->getFlowingForm());
$player->getLevel()->broadcastLevelSoundEvent($blockClicked->add(0.5, 0.5, 0.5), $resultBlock->getBucketEmptySound());
if($player->isSurvival()){
$player->getInventory()->setItemInHand($ev->getItem());
}
}else{
$player->getInventory()->sendContents($player);
}
return true;
}
return false;
}
}

45
src/pocketmine/item/MilkBucket.php Normal file
View File

@ -0,0 +1,45 @@
<?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/
*
*
*/
declare(strict_types=1);
namespace pocketmine\item;
use pocketmine\entity\Living;
class MilkBucket extends Item implements Consumable{
public function getMaxStackSize() : int{
return 1;
}
public function getResidue(){
return ItemFactory::get(Item::BUCKET, 0, 1);
}
public function getAdditionalEffects() : array{
return [];
}
public function onConsume(Living $consumer){
$consumer->removeAllEffects();
}
}