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

ProjectileItem: get NBT as far away as possible

Browse Source
This commit is contained in:
Dylan K. Taylor 2020-06-18 20:25:19 +01:00
parent b3df5f4e95
commit 0ae357cf8f
6 changed files with 75 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/item/Egg.php
View File

@ -23,7 +23,12 @@ declare(strict_types=1);
namespace pocketmine\item;
use pocketmine\entity\EntityFactory;
use pocketmine\entity\Location;
use pocketmine\entity\projectile\Egg as EggEntity;
use pocketmine\entity\projectile\Throwable;
use pocketmine\math\Vector3;
use pocketmine\player\Player;
class Egg extends ProjectileItem{
@ -31,8 +36,15 @@ class Egg extends ProjectileItem{
return 16;
}
public function getProjectileEntityClass() : string{
return EggEntity::class;
protected function createEntity(EntityFactory $factory, Location $location, Vector3 $velocity, Player $thrower) : Throwable{
/** @var EggEntity $projectile */
$projectile = $factory->create(
EggEntity::class,
$location->getWorldNonNull(),
EntityFactory::createBaseNBT($location, $velocity, $location->yaw, $location->pitch),
$thrower
);
return $projectile;
}
public function getThrowForce() : float{

16
src/item/EnderPearl.php
View File

@ -23,7 +23,12 @@ declare(strict_types=1);
namespace pocketmine\item;
use pocketmine\entity\EntityFactory;
use pocketmine\entity\Location;
use pocketmine\entity\projectile\EnderPearl as EnderPearlEntity;
use pocketmine\entity\projectile\Throwable;
use pocketmine\math\Vector3;
use pocketmine\player\Player;
class EnderPearl extends ProjectileItem{
@ -31,8 +36,15 @@ class EnderPearl extends ProjectileItem{
return 16;
}
public function getProjectileEntityClass() : string{
return EnderPearlEntity::class;
protected function createEntity(EntityFactory $factory, Location $location, Vector3 $velocity, Player $thrower) : Throwable{
/** @var EnderPearlEntity $projectile */
$projectile = $factory->create(
EnderPearlEntity::class,
$location->getWorldNonNull(),
EntityFactory::createBaseNBT($location, $velocity, $location->yaw, $location->pitch),
$thrower
);
return $projectile;
}
public function getThrowForce() : float{

16
src/item/ExperienceBottle.php
View File

@ -23,12 +23,24 @@ declare(strict_types=1);
namespace pocketmine\item;
use pocketmine\entity\EntityFactory;
use pocketmine\entity\Location;
use pocketmine\entity\projectile\ExperienceBottle as ExperienceBottleEntity;
use pocketmine\entity\projectile\Throwable;
use pocketmine\math\Vector3;
use pocketmine\player\Player;
class ExperienceBottle extends ProjectileItem{
public function getProjectileEntityClass() : string{
return ExperienceBottleEntity::class;
protected function createEntity(EntityFactory $factory, Location $location, Vector3 $velocity, Player $thrower) : Throwable{
/** @var ExperienceBottleEntity $projectile */
$projectile = $factory->create(
ExperienceBottleEntity::class,
$location->getWorldNonNull(),
EntityFactory::createBaseNBT($location, $velocity, $location->yaw, $location->pitch),
$thrower
);
return $projectile;
}
public function getThrowForce() : float{

26
src/item/ProjectileItem.php
View File

@ -24,43 +24,23 @@ declare(strict_types=1);
namespace pocketmine\item;
use pocketmine\entity\EntityFactory;
use pocketmine\entity\Location;
use pocketmine\entity\projectile\Throwable;
use pocketmine\event\entity\ProjectileLaunchEvent;
use pocketmine\math\Vector3;
use pocketmine\nbt\tag\CompoundTag;
use pocketmine\player\Player;
use pocketmine\utils\Utils;
use pocketmine\world\sound\ThrowSound;
abstract class ProjectileItem extends Item{
/**
* Returns the entity type that this projectile creates. This should return a ::class extending Throwable.
*
* @return string class extends Throwable
* @phpstan-return class-string<Throwable>
*/
abstract public function getProjectileEntityClass() : string;
abstract public function getThrowForce() : float;
/**
* Helper function to apply extra NBT tags to pass to the created projectile.
*/
protected function addExtraTags(CompoundTag $tag) : void{
}
abstract protected function createEntity(EntityFactory $factory, Location $location, Vector3 $velocity, Player $thrower) : Throwable;
public function onClickAir(Player $player, Vector3 $directionVector) : ItemUseResult{
$location = $player->getLocation();
$nbt = EntityFactory::createBaseNBT($player->getEyePos(), $directionVector, $location->yaw, $location->pitch);
$this->addExtraTags($nbt);
$class = $this->getProjectileEntityClass();
Utils::testValidInstance($class, Throwable::class);
/** @var Throwable $projectile */
$projectile = EntityFactory::getInstance()->create($class, $location->getWorldNonNull(), $nbt, $player);
$projectile = $this->createEntity(EntityFactory::getInstance(), Location::fromObject($player->getEyePos(), $player->getWorld(), $location->yaw, $location->pitch), $directionVector, $player);
$projectile->setMotion($projectile->getMotion()->multiply($this->getThrowForce()));
$projectileEv = new ProjectileLaunchEvent($projectile);

16
src/item/Snowball.php
View File

@ -23,7 +23,12 @@ declare(strict_types=1);
namespace pocketmine\item;
use pocketmine\entity\EntityFactory;
use pocketmine\entity\Location;
use pocketmine\entity\projectile\Snowball as SnowballEntity;
use pocketmine\entity\projectile\Throwable;
use pocketmine\math\Vector3;
use pocketmine\player\Player;
class Snowball extends ProjectileItem{
@ -31,8 +36,15 @@ class Snowball extends ProjectileItem{
return 16;
}
public function getProjectileEntityClass() : string{
return SnowballEntity::class;
protected function createEntity(EntityFactory $factory, Location $location, Vector3 $velocity, Player $thrower) : Throwable{
/** @var SnowballEntity $projectile */
$projectile = $factory->create(
SnowballEntity::class,
$location->getWorldNonNull(),
EntityFactory::createBaseNBT($location, $velocity, $location->yaw, $location->pitch),
$thrower
);
return $projectile;
}
public function getThrowForce() : float{

23
src/item/SplashPotion.php
View File

@ -23,8 +23,12 @@ declare(strict_types=1);
namespace pocketmine\item;
use pocketmine\entity\EntityFactory;
use pocketmine\entity\Location;
use pocketmine\entity\projectile\SplashPotion as SplashPotionEntity;
use pocketmine\nbt\tag\CompoundTag;
use pocketmine\entity\projectile\Throwable;
use pocketmine\math\Vector3;
use pocketmine\player\Player;
class SplashPotion extends ProjectileItem{
@ -32,15 +36,20 @@ class SplashPotion extends ProjectileItem{
return 1;
}
public function getProjectileEntityClass() : string{
return SplashPotionEntity::class;
protected function createEntity(EntityFactory $factory, Location $location, Vector3 $velocity, Player $thrower) : Throwable{
/** @var SplashPotionEntity $projectile */
$projectile = $factory->create(
SplashPotionEntity::class,
$location->getWorldNonNull(),
EntityFactory::createBaseNBT($location, $velocity, $location->yaw, $location->pitch),
$thrower
);
$projectile->setPotionId($this->meta);
return $projectile;
}
public function getThrowForce() : float{
return 0.5;
}
protected function addExtraTags(CompoundTag $tag) : void{
$tag->setShort("PotionId", $this->meta);
}
}