mirror of
https://github.com/pmmp/PocketMine-MP.git
synced 2025-09-08 02:42:58 +00:00
Renaming "Level" -> "World" (#2907)
This has been a pain point for a long time due to the misleading nature of the name "level". It's also confusing when trying to do things like getting the XP level of the player or such, and also does not translate well to other languages. This transition was already executed on the UI some time ago (language strings) and now it's time for the same change to occur on the API. This will burn a lot of plugins, but they'll acclimatize. Despite the scary size of this PR, there isn't actually so many changes to make. Most of this came from renaming `Position->getLevel()` to `Position->getWorld()`, or cosmetic changes like changing variable names or doc comments.
This commit is contained in:
@ -51,6 +51,6 @@ class EntityDamageByChildEntityEvent extends EntityDamageByEntityEvent{
|
||||
* @return Entity|null
|
||||
*/
|
||||
public function getChild() : ?Entity{
|
||||
return $this->getEntity()->getLevel()->getServer()->getLevelManager()->findEntity($this->childEntityEid);
|
||||
return $this->getEntity()->getWorld()->getServer()->getWorldManager()->findEntity($this->childEntityEid);
|
||||
}
|
||||
}
|
||||
|
@ -69,7 +69,7 @@ class EntityDamageByEntityEvent extends EntityDamageEvent{
|
||||
* @return Entity|null
|
||||
*/
|
||||
public function getDamager() : ?Entity{
|
||||
return $this->getEntity()->getLevel()->getServer()->getLevelManager()->findEntity($this->damagerEntityId);
|
||||
return $this->getEntity()->getWorld()->getServer()->getWorldManager()->findEntity($this->damagerEntityId);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -27,7 +27,7 @@ use pocketmine\block\Block;
|
||||
use pocketmine\entity\Entity;
|
||||
use pocketmine\event\Cancellable;
|
||||
use pocketmine\event\CancellableTrait;
|
||||
use pocketmine\level\Position;
|
||||
use pocketmine\world\Position;
|
||||
|
||||
/**
|
||||
* Called when a entity explodes
|
||||
|
@ -26,7 +26,7 @@ namespace pocketmine\event\entity;
|
||||
use pocketmine\entity\Entity;
|
||||
use pocketmine\event\Cancellable;
|
||||
use pocketmine\event\CancellableTrait;
|
||||
use pocketmine\level\Position;
|
||||
use pocketmine\world\Position;
|
||||
|
||||
class EntityTeleportEvent extends EntityEvent implements Cancellable{
|
||||
use CancellableTrait;
|
||||
|
@ -26,27 +26,27 @@ namespace pocketmine\event\entity;
|
||||
use pocketmine\entity\Entity;
|
||||
use pocketmine\event\Cancellable;
|
||||
use pocketmine\event\CancellableTrait;
|
||||
use pocketmine\level\Level;
|
||||
use pocketmine\world\World;
|
||||
|
||||
class EntityLevelChangeEvent extends EntityEvent implements Cancellable{
|
||||
class EntityWorldChangeEvent extends EntityEvent implements Cancellable{
|
||||
use CancellableTrait;
|
||||
|
||||
/** @var Level */
|
||||
private $originLevel;
|
||||
/** @var Level */
|
||||
private $targetLevel;
|
||||
/** @var World */
|
||||
private $originWorld;
|
||||
/** @var World */
|
||||
private $targetWorld;
|
||||
|
||||
public function __construct(Entity $entity, Level $originLevel, Level $targetLevel){
|
||||
public function __construct(Entity $entity, World $originWorld, World $targetWorld){
|
||||
$this->entity = $entity;
|
||||
$this->originLevel = $originLevel;
|
||||
$this->targetLevel = $targetLevel;
|
||||
$this->originWorld = $originWorld;
|
||||
$this->targetWorld = $targetWorld;
|
||||
}
|
||||
|
||||
public function getOrigin() : Level{
|
||||
return $this->originLevel;
|
||||
public function getOrigin() : World{
|
||||
return $this->originWorld;
|
||||
}
|
||||
|
||||
public function getTarget() : Level{
|
||||
return $this->targetLevel;
|
||||
public function getTarget() : World{
|
||||
return $this->targetWorld;
|
||||
}
|
||||
}
|
@ -25,7 +25,7 @@ namespace pocketmine\event\player;
|
||||
|
||||
use pocketmine\event\Cancellable;
|
||||
use pocketmine\event\CancellableTrait;
|
||||
use pocketmine\level\Location;
|
||||
use pocketmine\world\Location;
|
||||
use pocketmine\Player;
|
||||
|
||||
class PlayerMoveEvent extends PlayerEvent implements Cancellable{
|
||||
|
@ -23,7 +23,7 @@ declare(strict_types=1);
|
||||
|
||||
namespace pocketmine\event\player;
|
||||
|
||||
use pocketmine\level\Position;
|
||||
use pocketmine\world\Position;
|
||||
use pocketmine\Player;
|
||||
|
||||
/**
|
||||
|
@ -89,8 +89,8 @@ class QueryRegenerateEvent extends ServerEvent{
|
||||
$this->gametype = ($server->getGamemode()->getMagicNumber() & 0x01) === 0 ? "SMP" : "CMP";
|
||||
$this->version = $server->getVersion();
|
||||
$this->server_engine = $server->getName() . " " . $server->getPocketMineVersion();
|
||||
$level = $server->getLevelManager()->getDefaultLevel();
|
||||
$this->map = $level === null ? "unknown" : $level->getDisplayName();
|
||||
$world = $server->getWorldManager()->getDefaultWorld();
|
||||
$this->map = $world === null ? "unknown" : $world->getDisplayName();
|
||||
$this->numPlayers = count($this->players);
|
||||
$this->maxPlayers = $server->getMaxPlayers();
|
||||
$this->whitelist = $server->hasWhitelist() ? "on" : "off";
|
||||
|
@ -22,24 +22,24 @@
|
||||
declare(strict_types=1);
|
||||
|
||||
|
||||
namespace pocketmine\event\level;
|
||||
namespace pocketmine\event\world;
|
||||
|
||||
use pocketmine\level\format\Chunk;
|
||||
use pocketmine\level\Level;
|
||||
use pocketmine\world\format\Chunk;
|
||||
use pocketmine\world\World;
|
||||
|
||||
/**
|
||||
* Chunk-related events
|
||||
*/
|
||||
abstract class ChunkEvent extends LevelEvent{
|
||||
abstract class ChunkEvent extends WorldEvent{
|
||||
/** @var Chunk */
|
||||
private $chunk;
|
||||
|
||||
/**
|
||||
* @param Level $level
|
||||
* @param World $world
|
||||
* @param Chunk $chunk
|
||||
*/
|
||||
public function __construct(Level $level, Chunk $chunk){
|
||||
parent::__construct($level);
|
||||
public function __construct(World $world, Chunk $chunk){
|
||||
parent::__construct($world);
|
||||
$this->chunk = $chunk;
|
||||
}
|
||||
|
@ -22,10 +22,10 @@
|
||||
declare(strict_types=1);
|
||||
|
||||
|
||||
namespace pocketmine\event\level;
|
||||
namespace pocketmine\event\world;
|
||||
|
||||
use pocketmine\level\format\Chunk;
|
||||
use pocketmine\level\Level;
|
||||
use pocketmine\world\format\Chunk;
|
||||
use pocketmine\world\World;
|
||||
|
||||
/**
|
||||
* Called when a Chunk is loaded
|
||||
@ -34,8 +34,8 @@ class ChunkLoadEvent extends ChunkEvent{
|
||||
/** @var bool */
|
||||
private $newChunk;
|
||||
|
||||
public function __construct(Level $level, Chunk $chunk, bool $newChunk){
|
||||
parent::__construct($level, $chunk);
|
||||
public function __construct(World $world, Chunk $chunk, bool $newChunk){
|
||||
parent::__construct($world, $chunk);
|
||||
$this->newChunk = $newChunk;
|
||||
}
|
||||
|
@ -21,7 +21,7 @@
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace pocketmine\event\level;
|
||||
namespace pocketmine\event\world;
|
||||
|
||||
/**
|
||||
* Called when a Chunk is populated (after receiving it on the main thread)
|
@ -21,7 +21,7 @@
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace pocketmine\event\level;
|
||||
namespace pocketmine\event\world;
|
||||
|
||||
use pocketmine\event\Cancellable;
|
||||
use pocketmine\event\CancellableTrait;
|
@ -21,25 +21,25 @@
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace pocketmine\event\level;
|
||||
namespace pocketmine\event\world;
|
||||
|
||||
use pocketmine\level\Level;
|
||||
use pocketmine\level\Position;
|
||||
use pocketmine\world\Position;
|
||||
use pocketmine\world\World;
|
||||
|
||||
/**
|
||||
* An event that is called when a level spawn changes.
|
||||
* An event that is called when a world spawn changes.
|
||||
* The previous spawn is included
|
||||
*/
|
||||
class SpawnChangeEvent extends LevelEvent{
|
||||
class SpawnChangeEvent extends WorldEvent{
|
||||
/** @var Position */
|
||||
private $previousSpawn;
|
||||
|
||||
/**
|
||||
* @param Level $level
|
||||
* @param World $world
|
||||
* @param Position $previousSpawn
|
||||
*/
|
||||
public function __construct(Level $level, Position $previousSpawn){
|
||||
parent::__construct($level);
|
||||
public function __construct(World $world, Position $previousSpawn){
|
||||
parent::__construct($world);
|
||||
$this->previousSpawn = $previousSpawn;
|
||||
}
|
||||
|
@ -22,28 +22,28 @@
|
||||
declare(strict_types=1);
|
||||
|
||||
/**
|
||||
* Level related events
|
||||
* World related events
|
||||
*/
|
||||
namespace pocketmine\event\level;
|
||||
namespace pocketmine\event\world;
|
||||
|
||||
use pocketmine\event\Event;
|
||||
use pocketmine\level\Level;
|
||||
use pocketmine\world\World;
|
||||
|
||||
abstract class LevelEvent extends Event{
|
||||
/** @var Level */
|
||||
private $level;
|
||||
abstract class WorldEvent extends Event{
|
||||
/** @var World */
|
||||
private $world;
|
||||
|
||||
/**
|
||||
* @param Level $level
|
||||
* @param World $world
|
||||
*/
|
||||
public function __construct(Level $level){
|
||||
$this->level = $level;
|
||||
public function __construct(World $world){
|
||||
$this->world = $world;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return Level
|
||||
* @return World
|
||||
*/
|
||||
public function getLevel() : Level{
|
||||
return $this->level;
|
||||
public function getWorld() : World{
|
||||
return $this->world;
|
||||
}
|
||||
}
|
@ -21,11 +21,11 @@
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace pocketmine\event\level;
|
||||
namespace pocketmine\event\world;
|
||||
|
||||
/**
|
||||
* Called when a Level is initializing
|
||||
* Called when a World is initializing
|
||||
*/
|
||||
class LevelInitEvent extends LevelEvent{
|
||||
class WorldInitEvent extends WorldEvent{
|
||||
|
||||
}
|
@ -21,11 +21,11 @@
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace pocketmine\event\level;
|
||||
namespace pocketmine\event\world;
|
||||
|
||||
/**
|
||||
* Called when a Level is loaded
|
||||
* Called when a World is loaded
|
||||
*/
|
||||
class LevelLoadEvent extends LevelEvent{
|
||||
class WorldLoadEvent extends WorldEvent{
|
||||
|
||||
}
|
@ -21,11 +21,11 @@
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace pocketmine\event\level;
|
||||
namespace pocketmine\event\world;
|
||||
|
||||
/**
|
||||
* Called when a Level is saved
|
||||
* Called when a World is saved
|
||||
*/
|
||||
class LevelSaveEvent extends LevelEvent{
|
||||
class WorldSaveEvent extends WorldEvent{
|
||||
|
||||
}
|
@ -21,14 +21,14 @@
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace pocketmine\event\level;
|
||||
namespace pocketmine\event\world;
|
||||
|
||||
use pocketmine\event\Cancellable;
|
||||
use pocketmine\event\CancellableTrait;
|
||||
|
||||
/**
|
||||
* Called when a Level is unloaded
|
||||
* Called when a World is unloaded
|
||||
*/
|
||||
class LevelUnloadEvent extends LevelEvent implements Cancellable{
|
||||
class WorldUnloadEvent extends WorldEvent implements Cancellable{
|
||||
use CancellableTrait;
|
||||
}
|
Reference in New Issue
Block a user