Easy fixes

Author: dktapps

src/entity/object/FireworkRocket.php

@@ -51,7 +51,7 @@ class FireworkRocket extends Entity implements Explosive{
 	public static function getNetworkTypeId() : string{ return EntityIds::FIREWORKS_ROCKET; }
 
 	/* Maximum number of ticks this will live for. */
-	protected int $lifeTicks;
+	protected int $maxAgeTicks;
 
 	/** @var FireworkRocketExplosion[] */
 	protected array $explosions = [];
@@ -63,7 +63,7 @@ public function __construct(Location $location, int $lifeTicks, array $explosion
 		if ($lifeTicks < 0) {
 			throw new \InvalidArgumentException("Life ticks cannot be negative");
 		}
-		$this->lifeTicks = $lifeTicks;
+		$this->maxAgeTicks = $lifeTicks;
 		$this->setExplosions($explosions);
 
 		parent::__construct($location, $nbt);
@@ -78,20 +78,20 @@ protected function getInitialGravity() : float{ return 0.0; }
 	/**
 	 * Returns maximum number of ticks this will live for.
 	 */
-	public function getLifeTicks() : int{
-		return $this->lifeTicks;
+	public function getMaxAgeTicks() : int{
+		return $this->maxAgeTicks;
 	}
 
 	/**
 	 * Sets maximum number of ticks this will live for.
 	 *
 	 * @return $this
 	 */
-	public function setLifeTicks(int $lifeTicks) : self{
-		if ($lifeTicks < 0) {
-			throw new \InvalidArgumentException("Life ticks cannot be negative");
+	public function setMaxAgeTicks(int $maxAgeTicks) : self{
+		if ($maxAgeTicks < 0) {
+			throw new \InvalidArgumentException("Max age ticks cannot be negative");
 		}
-		$this->lifeTicks = $lifeTicks;
+		$this->maxAgeTicks = $maxAgeTicks;
 		return $this;
 	}
 
@@ -133,7 +133,7 @@ protected function entityBaseTick(int $tickDiff = 1) : bool{
 		if(!$this->isFlaggedForDespawn()){
 			$this->addMotion($this->motion->x * 0.15, 0.04, $this->motion->z * 0.15);
 
-			if($this->ticksLived >= $this->lifeTicks){
+			if($this->ticksLived >= $this->maxAgeTicks){
 				$this->flagForDespawn();
 				$this->explode();
 			}

src/item/FireworkRocket.php

@@ -27,12 +27,10 @@
 use pocketmine\data\SavedDataLoadingException;
 use pocketmine\entity\Location;
 use pocketmine\entity\object\FireworkRocket as FireworkEntity;
-use pocketmine\math\Facing;
 use pocketmine\math\Vector3;
 use pocketmine\nbt\tag\CompoundTag;
 use pocketmine\nbt\tag\ListTag;
 use pocketmine\player\Player;
-use pocketmine\utils\AssumptionFailedError;
 use pocketmine\utils\Utils;
 use function lcg_value;
 use function mt_rand;
@@ -95,17 +93,8 @@ public function setExplosions(array $explosions) : self{
 	}
 
 	public function onInteractBlock(Player $player, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, array &$returnedItems) : ItemUseResult{
-		$correction = 0.15;
-		$position = $blockClicked->getPosition()->addVector($clickVector);
-		$position = match($face){
-			Facing::DOWN => $position->add(0, -$correction, 0),
-			Facing::UP => $position->add(0, $correction, 0),
-			Facing::NORTH => $position->add(0, 0, -$correction),
-			Facing::SOUTH => $position->add(0, 0, $correction),
-			Facing::WEST => $position->add(-$correction, 0, 0),
-			Facing::EAST => $position->add($correction, 0, 0),
-			default => throw new AssumptionFailedError("Invalid facing $face")
-		};
+		//TODO: this would be nicer if Vector3::getSide() accepted floats for distance
+		$position = $blockClicked->getPosition()->addVector($clickVector)->addVector(Vector3::zero()->getSide($face)->multiply(0.15));
 
 		$randomDuration = (($this->flightDurationMultiplier + 1) * 10) + mt_rand(0, 12);
 

src/item/FireworkRocketExplosion.php

@@ -43,6 +43,9 @@ class FireworkRocketExplosion{
 	protected const TAG_TWINKLE = "FireworkFlicker"; //TAG_Byte
 	protected const TAG_TRAIL = "FireworkTrail"; //TAG_Byte
 
+	/**
+	 * @throws SavedDataLoadingException
+	 */
 	public static function fromCompoundTag(CompoundTag $tag) : self{
 		$colors = self::decodeColors($tag->getByteArray(self::TAG_COLORS));
 		if(count($colors) === 0){
@@ -61,6 +64,7 @@ public static function fromCompoundTag(CompoundTag $tag) : self{
 	/**
 	 * @return DyeColor[]
 	 * @phpstan-return list<DyeColor>
+	 * @throws SavedDataLoadingException
 	 */
 	protected static function decodeColors(string $colorsBytes) : array{
 		$colors = [];

src/item/FireworkStar.php

@@ -41,7 +41,13 @@ class FireworkStar extends Item{
 	public function __construct(ItemIdentifier $identifier, string $name){
 		parent::__construct($identifier, $name);
 
-		$this->explosion = new FireworkRocketExplosion(FireworkRocketType::SMALL_BALL, [DyeColor::BLACK], [], false, false);
+		$this->explosion = new FireworkRocketExplosion(
+			FireworkRocketType::SMALL_BALL,
+			colors: [DyeColor::BLACK],
+			fadeColors: [],
+			twinkle: false,
+			trail: false
+		);
 	}
 
 	public function getExplosion() : FireworkRocketExplosion{