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

base system

Browse Source
This commit is contained in:
ShockedPlot7560 2024-08-10 21:00:38 +02:00
parent 1ac08ea73b
commit 3ec3be6b20
No known key found for this signature in database
GPG Key ID: D7539B420F1FA86E
9 changed files with 176 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/block/Block.php
View File

@ -29,6 +29,7 @@ namespace pocketmine\block;
use pocketmine\block\tile\Spawnable;
use pocketmine\block\tile\Tile;
use pocketmine\block\utils\SupportType;
use pocketmine\block\utils\Waterloggable;
use pocketmine\data\runtime\InvalidSerializedRuntimeDataException;
use pocketmine\data\runtime\RuntimeDataDescriber;
use pocketmine\data\runtime\RuntimeDataReader;
@ -379,7 +380,13 @@ class Block{
if($chunk === null){
throw new AssumptionFailedError("World::setBlock() should have loaded the chunk before calling this method");
}
$chunk->setBlockStateId($this->position->x & Chunk::COORD_MASK, $this->position->y, $this->position->z & Chunk::COORD_MASK, $this->getStateId());
$x = $this->position->x & Chunk::COORD_MASK;
$z = $this->position->z & Chunk::COORD_MASK;
$stateId = $this->getStateId();
$chunk->setBlockStateId($x, $this->position->y, $z, $stateId);
if($this instanceof Waterloggable){
$chunk->setWaterStateId($x, $this->position->y, $z, $this->getWaterState()?->getStateId());
}
$tileType = $this->idInfo->getTileClass();
$oldTile = $world->getTile($this->position);

14
src/block/Stair.php
View File

@ -26,8 +26,11 @@ namespace pocketmine\block;
use pocketmine\block\utils\HorizontalFacingTrait;
use pocketmine\block\utils\StairShape;
use pocketmine\block\utils\SupportType;
use pocketmine\block\utils\Waterloggable;
use pocketmine\block\utils\WaterloggableTrait;
use pocketmine\data\runtime\RuntimeDataDescriber;
use pocketmine\item\Item;
use pocketmine\item\LiquidBucket;
use pocketmine\math\Axis;
use pocketmine\math\AxisAlignedBB;
use pocketmine\math\Facing;
@ -35,8 +38,9 @@ use pocketmine\math\Vector3;
use pocketmine\player\Player;
use pocketmine\world\BlockTransaction;
class Stair extends Transparent{
class Stair extends Transparent implements Waterloggable{
use HorizontalFacingTrait;
use WaterloggableTrait;
protected bool $upsideDown = false;
protected StairShape $shape = StairShape::STRAIGHT;
@ -134,4 +138,12 @@ class Stair extends Transparent{
return parent::place($tx, $item, $blockReplace, $blockClicked, $face, $clickVector, $player);
}
public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null, array &$returnedItems = []) : bool{
if($item instanceof LiquidBucket && $item->getLiquid() instanceof Water){
$this->position->getWorld()->setBlock($this->position, $this->setWaterState($item->getLiquid()));
}
return parent::onInteract($item, $face, $clickVector, $player, $returnedItems);
}
}

32
src/block/utils/Waterloggable.php Normal file
View File

@ -0,0 +1,32 @@
<?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 pocketmine\block\Water;
interface Waterloggable{
public function getWaterState() : ?Water;
public function setWaterState(?Water $state) : Waterloggable;
}

40
src/block/utils/WaterloggableTrait.php Normal file
View File

@ -0,0 +1,40 @@
<?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 pocketmine\block\Water;
trait WaterloggableTrait{
protected ?Water $waterState = null;
public function getWaterState() : ?Water {
return $this->waterState;
}
public function setWaterState(?Water $state) : self{
$this->waterState = $state;
return $this;
}
}

12
src/world/SimpleChunkManager.php
View File

@ -24,10 +24,11 @@ declare(strict_types=1);
namespace pocketmine\world;
use pocketmine\block\Block;
use pocketmine\block\RuntimeBlockStateRegistry;
use pocketmine\block\utils\Waterloggable;
use pocketmine\block\VanillaBlocks;
use pocketmine\utils\Limits;
use pocketmine\world\format\Chunk;
use pocketmine\world\utils\BlockChunkReader;
class SimpleChunkManager implements ChunkManager{
@ -41,14 +42,19 @@ class SimpleChunkManager implements ChunkManager{
public function getBlockAt(int $x, int $y, int $z) : Block{
if($this->isInWorld($x, $y, $z) && ($chunk = $this->getChunk($x >> Chunk::COORD_BIT_SIZE, $z >> Chunk::COORD_BIT_SIZE)) !== null){
return RuntimeBlockStateRegistry::getInstance()->fromStateId($chunk->getBlockStateId($x & Chunk::COORD_MASK, $y, $z & Chunk::COORD_MASK));
return BlockChunkReader::getBlock($chunk, $x & Chunk::COORD_MASK, $y, $z & Chunk::COORD_MASK);
}
return VanillaBlocks::AIR();
}
public function setBlockAt(int $x, int $y, int $z, Block $block) : void{
if(($chunk = $this->getChunk($x >> Chunk::COORD_BIT_SIZE, $z >> Chunk::COORD_BIT_SIZE)) !== null){
$chunk->setBlockStateId($x & Chunk::COORD_MASK, $y, $z & Chunk::COORD_MASK, $block->getStateId());
$xMasked = $x & Chunk::COORD_MASK;
$zMasked = $z & Chunk::COORD_MASK;
$chunk->setBlockStateId($xMasked, $y, $zMasked, $block->getStateId());
if($block instanceof Waterloggable){
$chunk->setWaterStateId($xMasked, $y, $zMasked, $block->getWaterState()?->getStateId());
}
}else{
throw new \InvalidArgumentException("Cannot set block at coordinates x=$x,y=$y,z=$z, terrain is not loaded or out of bounds");
}

5
src/world/World.php
View File

@ -103,6 +103,7 @@ use pocketmine\world\particle\BlockBreakParticle;
use pocketmine\world\particle\Particle;
use pocketmine\world\sound\BlockPlaceSound;
use pocketmine\world\sound\Sound;
use pocketmine\world\utils\BlockChunkReader;
use pocketmine\world\utils\SubChunkExplorer;
use pocketmine\YmlServerProperties;
use function abs;
@ -1893,7 +1894,7 @@ class World implements ChunkManager{
$chunk = $this->chunks[$chunkHash] ?? null;
if($chunk !== null){
$block = RuntimeBlockStateRegistry::getInstance()->fromStateId($chunk->getBlockStateId($x & Chunk::COORD_MASK, $y, $z & Chunk::COORD_MASK));
$block = BlockChunkReader::getBlock($chunk, $x & Chunk::COORD_MASK, $y, $z & Chunk::COORD_MASK);
}else{
$addToCache = false;
$block = VanillaBlocks::AIR();
@ -2542,7 +2543,7 @@ class World implements ChunkManager{
$localY = $tilePosition->getFloorY();
$localZ = $tilePosition->getFloorZ() & Chunk::COORD_MASK;
$newBlock = RuntimeBlockStateRegistry::getInstance()->fromStateId($chunk->getBlockStateId($localX, $localY, $localZ));
$newBlock = BlockChunkReader::getBlock($chunk, $localX, $localY, $localZ);;
$expectedTileClass = $newBlock->getIdInfo()->getTileClass();
if(
$expectedTileClass === null || //new block doesn't expect a tile

9
src/world/format/Chunk.php
View File

@ -107,6 +107,15 @@ class Chunk{
$this->terrainDirtyFlags |= self::DIRTY_FLAG_BLOCKS;
}
public function getWaterStateId(int $x, int $y, int $z) : int{
return $this->getSubChunk($y >> SubChunk::COORD_BIT_SIZE)->getWaterStateId($x, $y & SubChunk::COORD_MASK, $z);
}
public function setWaterStateId(int $x, int $y, int $z, ?int $block) : void{
$this->getSubChunk($y >> SubChunk::COORD_BIT_SIZE)->setWaterStateId($x, $y & SubChunk::COORD_MASK, $z, $block ?? Block::EMPTY_STATE_ID);
$this->terrainDirtyFlags |= self::DIRTY_FLAG_BLOCKS;
}
/**
* Returns the Y coordinate of the highest non-air block at the specified X/Z chunk block coordinates
*

14
src/world/format/SubChunk.php
View File

@ -83,6 +83,20 @@ class SubChunk{
$this->blockLayers[0]->set($x, $y, $z, $block);
}
public function getWaterStateId(int $x, int $y, int $z) : int{
if(count($this->blockLayers) < 2){
return $this->emptyBlockId;
}
return $this->blockLayers[1]->get($x, $y, $z);
}
public function setWaterStateId(int $x, int $y, int $z, int $block) : void{
if(count($this->blockLayers) < 2){
$this->blockLayers[1] = new PalettedBlockArray($this->emptyBlockId);
}
$this->blockLayers[1]->set($x, $y, $z, $block);
}
/**
* @return PalettedBlockArray[]
*/

48
src/world/utils/BlockChunkReader.php Normal file
View File

@ -0,0 +1,48 @@
<?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\world\utils;
use pocketmine\block\Block;
use pocketmine\block\RuntimeBlockStateRegistry;
use pocketmine\block\utils\Waterloggable;
use pocketmine\block\Water;
use pocketmine\world\format\Chunk;
class BlockChunkReader{
/**
* @param int $x The block's X coordinate masked to the chunk's bounds
* @param int $z The block's Z coordinate masked to the chunk's bounds
*/
public static function getBlock(Chunk $chunk, int $x, int $y, int $z) : Block {
$block = RuntimeBlockStateRegistry::getInstance()->fromStateId($chunk->getBlockStateId($x, $y, $z));
if($block instanceof Waterloggable){
$waterState = RuntimeBlockStateRegistry::getInstance()->fromStateId($chunk->getWaterStateId($x, $y, $z));
if($waterState instanceof Water){
$block->setWaterState($waterState);
}
}
return $block;
}
}