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

Added SignLikeRotationTrait

Browse Source
This commit is contained in:
Dylan K. Taylor 2020-10-04 21:09:45 +01:00
parent fc1084d65c
commit dfee8b7fa5
3 changed files with 52 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/block/FloorBanner.php
View File

@ -23,6 +23,7 @@ declare(strict_types=1);
namespace pocketmine\block; namespace pocketmine\block;
use pocketmine\block\utils\SignLikeRotationTrait;
use pocketmine\item\Item; use pocketmine\item\Item;
use pocketmine\math\Facing; use pocketmine\math\Facing;
use pocketmine\math\Vector3; use pocketmine\math\Vector3;
@ -30,8 +31,7 @@ use pocketmine\player\Player;
use pocketmine\world\BlockTransaction; use pocketmine\world\BlockTransaction;
final class FloorBanner extends BaseBanner{ final class FloorBanner extends BaseBanner{
/** @var int */ use SignLikeRotationTrait;
protected $rotation = 0;
public function readStateFromData(int $id, int $stateMeta) : void{ public function readStateFromData(int $id, int $stateMeta) : void{
$this->rotation = $stateMeta; $this->rotation = $stateMeta;
@ -55,7 +55,7 @@ final class FloorBanner extends BaseBanner{
} }
if($player !== null){ if($player !== null){
$this->rotation = ((int) floor((($player->getLocation()->getYaw() + 180) * 16 / 360) + 0.5)) & 0x0f; $this->rotation = self::getRotationFromYaw($player->getLocation()->getYaw());
} }
return parent::place($tx, $item, $blockReplace, $blockClicked, $face, $clickVector, $player); return parent::place($tx, $item, $blockReplace, $blockClicked, $face, $clickVector, $player);
} }

7
src/block/FloorSign.php
View File

@ -23,16 +23,15 @@ declare(strict_types=1);
namespace pocketmine\block; namespace pocketmine\block;
use pocketmine\block\utils\SignLikeRotationTrait;
use pocketmine\item\Item; use pocketmine\item\Item;
use pocketmine\math\Facing; use pocketmine\math\Facing;
use pocketmine\math\Vector3; use pocketmine\math\Vector3;
use pocketmine\player\Player; use pocketmine\player\Player;
use pocketmine\world\BlockTransaction; use pocketmine\world\BlockTransaction;
use function floor;
final class FloorSign extends BaseSign{ final class FloorSign extends BaseSign{
/** @var int */ use SignLikeRotationTrait;
protected $rotation = 0;
public function readStateFromData(int $id, int $stateMeta) : void{ public function readStateFromData(int $id, int $stateMeta) : void{
$this->rotation = $stateMeta; $this->rotation = $stateMeta;
@ -56,7 +55,7 @@ final class FloorSign extends BaseSign{
} }
if($player !== null){ if($player !== null){
$this->rotation = ((int) floor((($player->getLocation()->getYaw() + 180) * 16 / 360) + 0.5)) & 0x0f; $this->rotation = self::getRotationFromYaw($player->getLocation()->getYaw());
} }
return parent::place($tx, $item, $blockReplace, $blockClicked, $face, $clickVector, $player); return parent::place($tx, $item, $blockReplace, $blockClicked, $face, $clickVector, $player);
} }

46
src/block/utils/SignLikeRotationTrait.php Normal file
View File

@ -0,0 +1,46 @@
<?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\block\utils;
use function floor;
trait SignLikeRotationTrait{
/** @var int */
private $rotation = 0;
public function getRotation() : int{ return $this->rotation; }
/** @return $this */
public function setRotation(int $rotation) : self{
if($rotation < 0 || $rotation > 15){
throw new \InvalidArgumentException("Rotation must be in range 0-15");
}
$this->rotation = $rotation;
return $this;
}
private static function getRotationFromYaw(float $yaw) : int{
return ((int) floor((($yaw + 180) * 16 / 360) + 0.5)) & 0xf;
}
}