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

RuntimeBlockMapping::toRuntimeId() now accepts a single integer instead of id/meta

Browse Source 
the expectation is that eventually this will receive arbitrary internal runtime IDs instead of static id/meta, and RuntimeBlockMapping doesn't really care about this crap anyway.
This commit is contained in:
Dylan K. Taylor 2020-09-20 12:16:11 +01:00
parent 42b184c113
commit 5661d0496f
11 changed files with 15 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/entity/object/FallingBlock.php
View File

@ -147,7 +147,7 @@ class FallingBlock extends Entity{
protected function syncNetworkData(EntityMetadataCollection $properties) : void{ protected function syncNetworkData(EntityMetadataCollection $properties) : void{
parent::syncNetworkData($properties); parent::syncNetworkData($properties);
$properties->setInt(EntityMetadataProperties::VARIANT, RuntimeBlockMapping::getInstance()->toRuntimeId($this->block->getId(), $this->block->getMeta())); $properties->setInt(EntityMetadataProperties::VARIANT, RuntimeBlockMapping::getInstance()->toRuntimeId($this->block->getFullId()));
} }
public function getOffsetPosition(Vector3 $vector3) : Vector3{ public function getOffsetPosition(Vector3 $vector3) : Vector3{

16
src/network/mcpe/convert/RuntimeBlockMapping.php
View File

@ -135,21 +135,15 @@ final class RuntimeBlockMapping{
return $table; return $table;
} }
public function toRuntimeId(int $id, int $meta = 0) : int{ public function toRuntimeId(int $internalStateId) : int{
/* return $this->legacyToRuntimeMap[$internalStateId] ?? $this->legacyToRuntimeMap[BlockLegacyIds::INFO_UPDATE << 4];
* try id+meta first
* if not found, try id+0 (strip meta)
* if still not found, return update! block
*/
return $this->legacyToRuntimeMap[($id << 4) | $meta] ?? $this->legacyToRuntimeMap[$id << 4] ?? $this->legacyToRuntimeMap[BlockLegacyIds::INFO_UPDATE << 4];
} }
/** /**
* @return int[] [id, meta] * @return int
*/ */
public function fromRuntimeId(int $runtimeId) : array{ public function fromRuntimeId(int $runtimeId) : int{
$v = $this->runtimeToLegacyMap[$runtimeId]; return $this->runtimeToLegacyMap[$runtimeId];
return [$v >> 4, $v & 0xf];
} }
private function registerMapping(int $staticRuntimeId, int $legacyId, int $legacyMeta) : void{ private function registerMapping(int $staticRuntimeId, int $legacyId, int $legacyMeta) : void{

2
src/network/mcpe/serializer/ChunkSerializer.php
View File

@ -71,7 +71,7 @@ final class ChunkSerializer{
//zigzag and just shift directly. //zigzag and just shift directly.
$stream->putUnsignedVarInt(count($palette) << 1); //yes, this is intentionally zigzag $stream->putUnsignedVarInt(count($palette) << 1); //yes, this is intentionally zigzag
foreach($palette as $p){ foreach($palette as $p){
$stream->put(Binary::writeUnsignedVarInt($blockMapper->toRuntimeId($p >> 4, $p & 0xf) << 1)); $stream->put(Binary::writeUnsignedVarInt($blockMapper->toRuntimeId($p) << 1));
} }
} }
} }

2
src/world/World.php
View File

@ -829,7 +829,7 @@ class World implements ChunkManager{
} }
$fullBlock = $this->getBlockAt($b->x, $b->y, $b->z); $fullBlock = $this->getBlockAt($b->x, $b->y, $b->z);
$packets[] = UpdateBlockPacket::create($b->x, $b->y, $b->z, RuntimeBlockMapping::getInstance()->toRuntimeId($fullBlock->getId(), $fullBlock->getMeta())); $packets[] = UpdateBlockPacket::create($b->x, $b->y, $b->z, RuntimeBlockMapping::getInstance()->toRuntimeId($fullBlock->getFullId()));
$tile = $this->getTileAt($b->x, $b->y, $b->z); $tile = $this->getTileAt($b->x, $b->y, $b->z);
if($tile instanceof Spawnable){ if($tile instanceof Spawnable){

2
src/world/particle/BlockPunchParticle.php
View File

@ -44,6 +44,6 @@ class BlockPunchParticle implements Particle{
} }
public function encode(Vector3 $pos){ public function encode(Vector3 $pos){
return LevelEventPacket::create(LevelEventPacket::EVENT_PARTICLE_PUNCH_BLOCK, RuntimeBlockMapping::getInstance()->toRuntimeId($this->block->getId(), $this->block->getMeta()) | ($this->face << 24), $pos); return LevelEventPacket::create(LevelEventPacket::EVENT_PARTICLE_PUNCH_BLOCK, RuntimeBlockMapping::getInstance()->toRuntimeId($this->block->getFullId()) | ($this->face << 24), $pos);
} }
} }

2
src/world/particle/DestroyBlockParticle.php
View File

@ -38,6 +38,6 @@ class DestroyBlockParticle implements Particle{
} }
public function encode(Vector3 $pos){ public function encode(Vector3 $pos){
return LevelEventPacket::create(LevelEventPacket::EVENT_PARTICLE_DESTROY, RuntimeBlockMapping::getInstance()->toRuntimeId($this->block->getId(), $this->block->getMeta()), $pos); return LevelEventPacket::create(LevelEventPacket::EVENT_PARTICLE_DESTROY, RuntimeBlockMapping::getInstance()->toRuntimeId($this->block->getFullId()), $pos);
} }
} }

2
src/world/particle/TerrainParticle.php
View File

@ -38,6 +38,6 @@ class TerrainParticle implements Particle{
} }
public function encode(Vector3 $pos){ public function encode(Vector3 $pos){
return LevelEventPacket::standardParticle(ParticleIds::TERRAIN, RuntimeBlockMapping::getInstance()->toRuntimeId($this->block->getId(), $this->block->getMeta()), $pos); return LevelEventPacket::standardParticle(ParticleIds::TERRAIN, RuntimeBlockMapping::getInstance()->toRuntimeId($this->block->getFullId()), $pos);
} }
} }

2
src/world/sound/BlockBreakSound.php
View File

@ -38,6 +38,6 @@ class BlockBreakSound implements Sound{
} }
public function encode(?Vector3 $pos){ public function encode(?Vector3 $pos){
return LevelSoundEventPacket::create(LevelSoundEventPacket::SOUND_BREAK, $pos, RuntimeBlockMapping::getInstance()->toRuntimeId($this->block->getId(), $this->block->getMeta())); return LevelSoundEventPacket::create(LevelSoundEventPacket::SOUND_BREAK, $pos, RuntimeBlockMapping::getInstance()->toRuntimeId($this->block->getFullId()));
} }
} }

2
src/world/sound/BlockPlaceSound.php
View File

@ -38,6 +38,6 @@ class BlockPlaceSound implements Sound{
} }
public function encode(?Vector3 $pos){ public function encode(?Vector3 $pos){
return LevelSoundEventPacket::create(LevelSoundEventPacket::SOUND_PLACE, $pos, RuntimeBlockMapping::getInstance()->toRuntimeId($this->block->getId(), $this->block->getMeta())); return LevelSoundEventPacket::create(LevelSoundEventPacket::SOUND_PLACE, $pos, RuntimeBlockMapping::getInstance()->toRuntimeId($this->block->getFullId()));
} }
} }

2
src/world/sound/BlockPunchSound.php
View File

@ -44,7 +44,7 @@ class BlockPunchSound implements Sound{
return LevelSoundEventPacket::create( return LevelSoundEventPacket::create(
LevelSoundEventPacket::SOUND_HIT, LevelSoundEventPacket::SOUND_HIT,
$pos, $pos,
RuntimeBlockMapping::getInstance()->toRuntimeId($this->block->getId(), $this->block->getMeta()) RuntimeBlockMapping::getInstance()->toRuntimeId($this->block->getFullId())
); );
} }
} }

2
src/world/sound/EntityLandSound.php
View File

@ -48,7 +48,7 @@ class EntityLandSound implements Sound{
return LevelSoundEventPacket::create( return LevelSoundEventPacket::create(
LevelSoundEventPacket::SOUND_LAND, LevelSoundEventPacket::SOUND_LAND,
$pos, $pos,
RuntimeBlockMapping::getInstance()->toRuntimeId($this->blockLandedOn->getId(), $this->blockLandedOn->getMeta()), RuntimeBlockMapping::getInstance()->toRuntimeId($this->blockLandedOn->getFullId()),
$this->entity::getNetworkTypeId() $this->entity::getNetworkTypeId()
//TODO: does isBaby have any relevance here? //TODO: does isBaby have any relevance here?
); );