diff --git a/composer.lock b/composer.lock index 8269f9a20..d56dea85a 100644 --- a/composer.lock +++ b/composer.lock @@ -117,16 +117,16 @@ }, { "name": "mdanter/ecc", - "version": "v0.5.1", + "version": "v0.5.2", "source": { "type": "git", "url": "https://github.com/phpecc/phpecc.git", - "reference": "9a3aca17c6dfc04bdaad2e7ddab3b8df656ffc5b" + "reference": "b95f25cc1bacc83a9f0ccd375900b7cfd343029e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpecc/phpecc/zipball/9a3aca17c6dfc04bdaad2e7ddab3b8df656ffc5b", - "reference": "9a3aca17c6dfc04bdaad2e7ddab3b8df656ffc5b", + "url": "https://api.github.com/repos/phpecc/phpecc/zipball/b95f25cc1bacc83a9f0ccd375900b7cfd343029e", + "reference": "b95f25cc1bacc83a9f0ccd375900b7cfd343029e", "shasum": "" }, "require": { @@ -185,7 +185,7 @@ "secp256k1", "secp256r1" ], - "time": "2018-12-01T23:35:23+00:00" + "time": "2018-12-03T18:17:01+00:00" }, { "name": "pocketmine/binaryutils", @@ -227,12 +227,12 @@ "source": { "type": "git", "url": "https://github.com/pmmp/Math.git", - "reference": "5bb6facf8c46212bdb78d6bb1be6fbd2891b200d" + "reference": "a162c02be87fd49abd195a7330e61be9d4b8e766" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pmmp/Math/zipball/5bb6facf8c46212bdb78d6bb1be6fbd2891b200d", - "reference": "5bb6facf8c46212bdb78d6bb1be6fbd2891b200d", + "url": "https://api.github.com/repos/pmmp/Math/zipball/a162c02be87fd49abd195a7330e61be9d4b8e766", + "reference": "a162c02be87fd49abd195a7330e61be9d4b8e766", "shasum": "" }, "require": { @@ -258,7 +258,7 @@ "source": "https://github.com/pmmp/Math/tree/master", "issues": "https://github.com/pmmp/Math/issues" }, - "time": "2018-12-02T11:40:31+00:00" + "time": "2018-12-07T10:47:16+00:00" }, { "name": "pocketmine/nbt", diff --git a/src/pocketmine/block/Anvil.php b/src/pocketmine/block/Anvil.php index 5f48df0f1..8dd96332f 100644 --- a/src/pocketmine/block/Anvil.php +++ b/src/pocketmine/block/Anvil.php @@ -74,7 +74,7 @@ class Anvil extends Fallable{ } public function recalculateBoundingBox() : ?AxisAlignedBB{ - return AxisAlignedBB::one()->squash(Facing::axis(Facing::rotate($this->facing, Facing::AXIS_Y, false)), 1 / 8); + return AxisAlignedBB::one()->squash(Facing::axis(Facing::rotateY($this->facing, false)), 1 / 8); } public function onActivate(Item $item, Player $player = null) : bool{ @@ -87,7 +87,7 @@ class Anvil extends Fallable{ public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, Player $player = null) : bool{ if($player !== null){ - $this->facing = Facing::rotate($player->getHorizontalFacing(), Facing::AXIS_Y, true); + $this->facing = Facing::rotateY($player->getHorizontalFacing(), true); } return parent::place($item, $blockReplace, $blockClicked, $face, $clickVector, $player); } diff --git a/src/pocketmine/block/Chest.php b/src/pocketmine/block/Chest.php index c83ef3eac..2a6de15a7 100644 --- a/src/pocketmine/block/Chest.php +++ b/src/pocketmine/block/Chest.php @@ -78,8 +78,8 @@ class Chest extends Transparent{ } foreach([ - Facing::rotate($player->getHorizontalFacing(), Facing::AXIS_Y, false), - Facing::rotate($player->getHorizontalFacing(), Facing::AXIS_Y, true) + Facing::rotateY($player->getHorizontalFacing(), false), + Facing::rotateY($player->getHorizontalFacing(), true) ] as $side){ $c = $this->getSide($side); if($c instanceof Chest and $c->isSameType($this) and $c->facing === $this->facing){ diff --git a/src/pocketmine/block/CocoaBlock.php b/src/pocketmine/block/CocoaBlock.php index b2225bf73..3c58587c5 100644 --- a/src/pocketmine/block/CocoaBlock.php +++ b/src/pocketmine/block/CocoaBlock.php @@ -75,7 +75,7 @@ class CocoaBlock extends Transparent{ protected function recalculateBoundingBox() : ?AxisAlignedBB{ return AxisAlignedBB::one() - ->squash(Facing::axis(Facing::rotate($this->facing, Facing::AXIS_Y, true)), (6 - $this->age) / 16) //sides + ->squash(Facing::axis(Facing::rotateY($this->facing, true)), (6 - $this->age) / 16) //sides ->trim(Facing::DOWN, (7 - $this->age * 2) / 16) ->trim(Facing::UP, 0.25) ->trim(Facing::opposite($this->facing), 1 / 16) //gap between log and pod diff --git a/src/pocketmine/block/Door.php b/src/pocketmine/block/Door.php index fcf9573e6..f1221e1b6 100644 --- a/src/pocketmine/block/Door.php +++ b/src/pocketmine/block/Door.php @@ -92,7 +92,7 @@ abstract class Door extends Transparent{ protected function recalculateBoundingBox() : ?AxisAlignedBB{ return AxisAlignedBB::one() ->extend(Facing::UP, 1) - ->trim($this->open ? Facing::rotate($this->facing, Facing::AXIS_Y, !$this->hingeRight) : $this->facing, 13 / 16); + ->trim($this->open ? Facing::rotateY($this->facing, !$this->hingeRight) : $this->facing, 13 / 16); } public function onNearbyBlockChange() : void{ @@ -113,8 +113,8 @@ abstract class Door extends Transparent{ $this->facing = $player->getHorizontalFacing(); } - $next = $this->getSide(Facing::rotate($this->facing, Facing::AXIS_Y, false)); - $next2 = $this->getSide(Facing::rotate($this->facing, Facing::AXIS_Y, true)); + $next = $this->getSide(Facing::rotateY($this->facing, false)); + $next2 = $this->getSide(Facing::rotateY($this->facing, true)); if($next->isSameType($this) or (!$next2->isTransparent() and $next->isTransparent())){ //Door hinge $this->hingeRight = true; diff --git a/src/pocketmine/block/Stair.php b/src/pocketmine/block/Stair.php index 4a26c4ca2..6ef67b32d 100644 --- a/src/pocketmine/block/Stair.php +++ b/src/pocketmine/block/Stair.php @@ -59,7 +59,7 @@ abstract class Stair extends Transparent{ public function readStateFromWorld() : void{ parent::readStateFromWorld(); - $clockwise = Facing::rotate($this->facing, Facing::AXIS_Y, true); + $clockwise = Facing::rotateY($this->facing, true); if(($backFacing = $this->getPossibleCornerFacing(false)) !== null){ $this->shape = $backFacing === $clockwise ? self::SHAPE_OUTER_RIGHT : self::SHAPE_OUTER_LEFT; }elseif(($frontFacing = $this->getPossibleCornerFacing(true)) !== null){ @@ -82,13 +82,13 @@ abstract class Stair extends Transparent{ $topStep->trim(Facing::opposite($this->facing), 0.5); if($this->shape === self::SHAPE_OUTER_LEFT or $this->shape === self::SHAPE_OUTER_RIGHT){ - $topStep->trim(Facing::rotate($this->facing, Facing::AXIS_Y, $this->shape === self::SHAPE_OUTER_LEFT), 0.5); + $topStep->trim(Facing::rotateY($this->facing, $this->shape === self::SHAPE_OUTER_LEFT), 0.5); }elseif($this->shape === self::SHAPE_INNER_LEFT or $this->shape === self::SHAPE_INNER_RIGHT){ //add an extra cube $extraCube = new AxisAlignedBB(0, $minY, 0, 1, $minY + 0.5, 1); $bbs[] = $extraCube ->trim($this->facing, 0.5) //avoid overlapping with main step - ->trim(Facing::rotate($this->facing, Facing::AXIS_Y, $this->shape === self::SHAPE_INNER_LEFT), 0.5); + ->trim(Facing::rotateY($this->facing, $this->shape === self::SHAPE_INNER_LEFT), 0.5); } $bbs[] = $topStep; diff --git a/src/pocketmine/entity/object/Painting.php b/src/pocketmine/entity/object/Painting.php index 66602ab4f..072f70ef1 100644 --- a/src/pocketmine/entity/object/Painting.php +++ b/src/pocketmine/entity/object/Painting.php @@ -240,7 +240,7 @@ class Painting extends Entity{ $horizontalStart = (int) (ceil($width / 2) - 1); $verticalStart = (int) (ceil($height / 2) - 1); - $rotatedFace = Facing::rotate($facing, Facing::AXIS_Y, false); + $rotatedFace = Facing::rotateY($facing, false); $oppositeSide = Facing::opposite($facing);