mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-07-14 22:01:59 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'minor-next' into blockstate-schema-generator-improvements

Browse Source
This commit is contained in:
Dylan T. 2024-10-24 17:46:57 +01:00 committed by GitHub
commit 847f931660
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
9 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/block/Copper.php
View File

@ -23,9 +23,9 @@ declare(strict_types=1);
namespace pocketmine\block; namespace pocketmine\block;
use pocketmine\block\utils\CopperMaterial;
use pocketmine\block\utils\CopperTrait; use pocketmine\block\utils\CopperTrait;
use pocketmine\block\utils\ICopper;
class Copper extends Opaque implements ICopper{ class Copper extends Opaque implements CopperMaterial{
use CopperTrait; use CopperTrait;
} }

4
src/block/CopperBulb.php
View File

@ -23,14 +23,14 @@ declare(strict_types=1);
namespace pocketmine\block; namespace pocketmine\block;
use pocketmine\block\utils\CopperMaterial;
use pocketmine\block\utils\CopperOxidation; use pocketmine\block\utils\CopperOxidation;
use pocketmine\block\utils\CopperTrait; use pocketmine\block\utils\CopperTrait;
use pocketmine\block\utils\ICopper;
use pocketmine\block\utils\LightableTrait; use pocketmine\block\utils\LightableTrait;
use pocketmine\block\utils\PoweredByRedstoneTrait; use pocketmine\block\utils\PoweredByRedstoneTrait;
use pocketmine\data\runtime\RuntimeDataDescriber; use pocketmine\data\runtime\RuntimeDataDescriber;
class CopperBulb extends Opaque implements ICopper{ class CopperBulb extends Opaque implements CopperMaterial{
use CopperTrait; use CopperTrait;
use PoweredByRedstoneTrait; use PoweredByRedstoneTrait;
use LightableTrait{ use LightableTrait{

4
src/block/CopperDoor.php
View File

@ -23,14 +23,14 @@ declare(strict_types=1);
namespace pocketmine\block; namespace pocketmine\block;
use pocketmine\block\utils\CopperMaterial;
use pocketmine\block\utils\CopperTrait; use pocketmine\block\utils\CopperTrait;
use pocketmine\block\utils\ICopper;
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;
class CopperDoor extends Door implements ICopper{ class CopperDoor extends Door implements CopperMaterial{
use CopperTrait{ use CopperTrait{
onInteract as onInteractCopper; onInteract as onInteractCopper;
} }

4
src/block/CopperGrate.php
View File

@ -23,10 +23,10 @@ declare(strict_types=1);
namespace pocketmine\block; namespace pocketmine\block;
use pocketmine\block\utils\CopperMaterial;
use pocketmine\block\utils\CopperTrait; use pocketmine\block\utils\CopperTrait;
use pocketmine\block\utils\ICopper;
class CopperGrate extends Transparent implements ICopper{ class CopperGrate extends Transparent implements CopperMaterial{
use CopperTrait; use CopperTrait;
//TODO: waterlogging! //TODO: waterlogging!

4
src/block/CopperSlab.php
View File

@ -23,9 +23,9 @@ declare(strict_types=1);
namespace pocketmine\block; namespace pocketmine\block;
use pocketmine\block\utils\CopperMaterial;
use pocketmine\block\utils\CopperTrait; use pocketmine\block\utils\CopperTrait;
use pocketmine\block\utils\ICopper;
class CopperSlab extends Slab implements ICopper{ class CopperSlab extends Slab implements CopperMaterial{
use CopperTrait; use CopperTrait;
} }

4
src/block/CopperStairs.php
View File

@ -23,9 +23,9 @@ declare(strict_types=1);
namespace pocketmine\block; namespace pocketmine\block;
use pocketmine\block\utils\CopperMaterial;
use pocketmine\block\utils\CopperTrait; use pocketmine\block\utils\CopperTrait;
use pocketmine\block\utils\ICopper;
class CopperStairs extends Stair implements ICopper{ class CopperStairs extends Stair implements CopperMaterial{
use CopperTrait; use CopperTrait;
} }

4
src/block/CopperTrapdoor.php
View File

@ -23,13 +23,13 @@ declare(strict_types=1);
namespace pocketmine\block; namespace pocketmine\block;
use pocketmine\block\utils\CopperMaterial;
use pocketmine\block\utils\CopperTrait; use pocketmine\block\utils\CopperTrait;
use pocketmine\block\utils\ICopper;
use pocketmine\item\Item; use pocketmine\item\Item;
use pocketmine\math\Vector3; use pocketmine\math\Vector3;
use pocketmine\player\Player; use pocketmine\player\Player;
class CopperTrapdoor extends Trapdoor implements ICopper{ class CopperTrapdoor extends Trapdoor implements CopperMaterial{
use CopperTrait{ use CopperTrait{
onInteract as onInteractCopper; onInteract as onInteractCopper;
} }

6
src/block/utils/ICopper.php → src/block/utils/CopperMaterial.php
View File

@ -26,13 +26,13 @@ namespace pocketmine\block\utils;
/** /**
* Represents copper blocks that have oxidized and waxed variations. * Represents copper blocks that have oxidized and waxed variations.
*/ */
interface ICopper{ interface CopperMaterial{
public function getOxidation() : CopperOxidation; public function getOxidation() : CopperOxidation;
public function setOxidation(CopperOxidation $oxidation) : ICopper; public function setOxidation(CopperOxidation $oxidation) : CopperMaterial;
public function isWaxed() : bool; public function isWaxed() : bool;
public function setWaxed(bool $waxed) : ICopper; public function setWaxed(bool $waxed) : CopperMaterial;
} }

10
src/data/bedrock/block/convert/BlockStateDeserializerHelper.php
View File

@ -45,8 +45,8 @@ use pocketmine\block\Slab;
use pocketmine\block\Stair; use pocketmine\block\Stair;
use pocketmine\block\Stem; use pocketmine\block\Stem;
use pocketmine\block\Trapdoor; use pocketmine\block\Trapdoor;
use pocketmine\block\utils\CopperMaterial;
use pocketmine\block\utils\CopperOxidation; use pocketmine\block\utils\CopperOxidation;
use pocketmine\block\utils\ICopper;
use pocketmine\block\utils\SlabType; use pocketmine\block\utils\SlabType;
use pocketmine\block\VanillaBlocks; use pocketmine\block\VanillaBlocks;
use pocketmine\block\Wall; use pocketmine\block\Wall;
@ -98,24 +98,24 @@ final class BlockStateDeserializerHelper{
} }
/** /**
* @phpstan-template TBlock of ICopper * @phpstan-template TBlock of CopperMaterial
* *
* @phpstan-param TBlock $block * @phpstan-param TBlock $block
* @phpstan-return TBlock * @phpstan-return TBlock
*/ */
public static function decodeCopper(ICopper $block, CopperOxidation $oxidation) : ICopper{ public static function decodeCopper(CopperMaterial $block, CopperOxidation $oxidation) : CopperMaterial{
$block->setOxidation($oxidation); $block->setOxidation($oxidation);
$block->setWaxed(false); $block->setWaxed(false);
return $block; return $block;
} }
/** /**
* @phpstan-template TBlock of ICopper * @phpstan-template TBlock of CopperMaterial
* *
* @phpstan-param TBlock $block * @phpstan-param TBlock $block
* @phpstan-return TBlock * @phpstan-return TBlock
*/ */
public static function decodeWaxedCopper(ICopper $block, CopperOxidation $oxidation) : ICopper{ public static function decodeWaxedCopper(CopperMaterial $block, CopperOxidation $oxidation) : CopperMaterial{
$block->setOxidation($oxidation); $block->setOxidation($oxidation);
$block->setWaxed(true); $block->setWaxed(true);
return $block; return $block;