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

Update for pocketmine/math Axis refactor

Browse Source
This commit is contained in:
Dylan K. Taylor
2020-08-06 14:38:31 +01:00
parent 7399e6944e
commit 2b044195a5
17 changed files with 50 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/block/utils/BlockDataSerializer.php
View File

@@ -23,6 +23,7 @@ declare(strict_types=1);
namespace pocketmine\block\utils;
use pocketmine\math\Axis;
use pocketmine\math\Facing;
final class BlockDataSerializer{
@@ -69,14 +70,14 @@ final class BlockDataSerializer{
*/
public static function readHorizontalFacing(int $facing) : int{
$facing = self::readFacing($facing);
if(Facing::axis($facing) === Facing::AXIS_Y){
if(Facing::axis($facing) === Axis::Y){
throw new InvalidBlockStateException("Invalid Y-axis facing $facing");
}
return $facing;
}
public static function writeHorizontalFacing(int $facing) : int{
if(Facing::axis($facing) === Facing::AXIS_Y){
if(Facing::axis($facing) === Axis::Y){
throw new \InvalidArgumentException("Invalid Y-axis facing");
}
return self::writeFacing($facing);

15
src/block/utils/PillarRotationTrait.php
View File

@@ -25,6 +25,7 @@ namespace pocketmine\block\utils;
use pocketmine\block\Block;
use pocketmine\item\Item;
use pocketmine\math\Axis;
use pocketmine\math\Facing;
use pocketmine\math\Vector3;
use pocketmine\player\Player;
@@ -33,7 +34,7 @@ use pocketmine\world\BlockTransaction;
trait PillarRotationTrait{
/** @var int */
protected $axis = Facing::AXIS_Y;
protected $axis = Axis::Y;
protected function getAxisMetaShift() : int{
return 2; //default
@@ -62,9 +63,9 @@ trait PillarRotationTrait{
protected function readAxisFromMeta(int $meta) : void{
static $map = [
0 => Facing::AXIS_Y,
1 => Facing::AXIS_X,
2 => Facing::AXIS_Z
0 => Axis::Y,
1 => Axis::X,
2 => Axis::Z
];
$axis = $meta >> $this->getAxisMetaShift();
if(!isset($map[$axis])){
@@ -75,9 +76,9 @@ trait PillarRotationTrait{
protected function writeAxisToMeta() : int{
static $bits = [
Facing::AXIS_Y => 0,
Facing::AXIS_Z => 2,
Facing::AXIS_X => 1
Axis::Y => 0,
Axis::Z => 2,
Axis::X => 1
];
return $bits[$this->axis] << $this->getAxisMetaShift();
}