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

Rename TranslationContainer -> Translatable

Browse Source
This commit is contained in:
Dylan K. Taylor
2021-08-15 16:17:46 +01:00
parent 5bdcc0339f
commit 789a669395
16 changed files with 757 additions and 757 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/event/player/PlayerDeathEvent.php
View File

@ -31,23 +31,23 @@ use pocketmine\event\entity\EntityDamageEvent;
use pocketmine\event\entity\EntityDeathEvent;
use pocketmine\item\Item;
use pocketmine\lang\KnownTranslationFactory;
use pocketmine\lang\TranslationContainer;
use pocketmine\lang\Translatable;
use pocketmine\player\Player;
class PlayerDeathEvent extends EntityDeathEvent{
/** @var Player */
protected $entity;
/** @var TranslationContainer|string */
/** @var Translatable|string */
private $deathMessage;
/** @var bool */
private $keepInventory = false;
/**
* @param Item[] $drops
* @param string|TranslationContainer|null $deathMessage Null will cause the default vanilla message to be used
* @param Item[] $drops
* @param string|Translatable|null $deathMessage Null will cause the default vanilla message to be used
*/
public function __construct(Player $entity, array $drops, int $xp, TranslationContainer|string|null $deathMessage){
public function __construct(Player $entity, array $drops, int $xp, Translatable|string|null $deathMessage){
parent::__construct($entity, $drops, $xp);
$this->deathMessage = $deathMessage ?? self::deriveMessage($entity->getDisplayName(), $entity->getLastDamageCause());
}
@ -63,11 +63,11 @@ class PlayerDeathEvent extends EntityDeathEvent{
return $this->entity;
}
public function getDeathMessage() : TranslationContainer|string{
public function getDeathMessage() : Translatable|string{
return $this->deathMessage;
}
public function setDeathMessage(TranslationContainer|string $deathMessage) : void{
public function setDeathMessage(Translatable|string $deathMessage) : void{
$this->deathMessage = $deathMessage;
}
@ -82,7 +82,7 @@ class PlayerDeathEvent extends EntityDeathEvent{
/**
* Returns the vanilla death message for the given death cause.
*/
public static function deriveMessage(string $name, ?EntityDamageEvent $deathCause) : TranslationContainer{
public static function deriveMessage(string $name, ?EntityDamageEvent $deathCause) : Translatable{
switch($deathCause === null ? EntityDamageEvent::CAUSE_CUSTOM : $deathCause->getCause()){
case EntityDamageEvent::CAUSE_ENTITY_ATTACK:
if($deathCause instanceof EntityDamageByEntityEvent){

10
src/event/player/PlayerJoinEvent.php
View File

@ -23,7 +23,7 @@ declare(strict_types=1);
namespace pocketmine\event\player;
use pocketmine\lang\TranslationContainer;
use pocketmine\lang\Translatable;
use pocketmine\player\Player;
/**
@ -34,19 +34,19 @@ use pocketmine\player\Player;
* @see PlayerLoginEvent
*/
class PlayerJoinEvent extends PlayerEvent{
/** @var string|TranslationContainer */
/** @var string|Translatable */
protected $joinMessage;
public function __construct(Player $player, TranslationContainer|string $joinMessage){
public function __construct(Player $player, Translatable|string $joinMessage){
$this->player = $player;
$this->joinMessage = $joinMessage;
}
public function setJoinMessage(TranslationContainer|string $joinMessage) : void{
public function setJoinMessage(Translatable|string $joinMessage) : void{
$this->joinMessage = $joinMessage;
}
public function getJoinMessage() : TranslationContainer|string{
public function getJoinMessage() : Translatable|string{
return $this->joinMessage;
}
}

10
src/event/player/PlayerKickEvent.php
View File

@ -25,7 +25,7 @@ namespace pocketmine\event\player;
use pocketmine\event\Cancellable;
use pocketmine\event\CancellableTrait;
use pocketmine\lang\TranslationContainer;
use pocketmine\lang\Translatable;
use pocketmine\player\Player;
/**
@ -34,13 +34,13 @@ use pocketmine\player\Player;
class PlayerKickEvent extends PlayerEvent implements Cancellable{
use CancellableTrait;
/** @var TranslationContainer|string */
/** @var Translatable|string */
protected $quitMessage;
/** @var string */
protected $reason;
public function __construct(Player $player, string $reason, TranslationContainer|string $quitMessage){
public function __construct(Player $player, string $reason, Translatable|string $quitMessage){
$this->player = $player;
$this->quitMessage = $quitMessage;
$this->reason = $reason;
@ -54,11 +54,11 @@ class PlayerKickEvent extends PlayerEvent implements Cancellable{
return $this->reason;
}
public function setQuitMessage(TranslationContainer|string $quitMessage) : void{
public function setQuitMessage(Translatable|string $quitMessage) : void{
$this->quitMessage = $quitMessage;
}
public function getQuitMessage() : TranslationContainer|string{
public function getQuitMessage() : Translatable|string{
return $this->quitMessage;
}
}

10
src/event/player/PlayerQuitEvent.php
View File

@ -23,7 +23,7 @@ declare(strict_types=1);
namespace pocketmine\event\player;
use pocketmine\lang\TranslationContainer;
use pocketmine\lang\Translatable;
use pocketmine\player\Player;
/**
@ -31,22 +31,22 @@ use pocketmine\player\Player;
*/
class PlayerQuitEvent extends PlayerEvent{
/** @var TranslationContainer|string */
/** @var Translatable|string */
protected $quitMessage;
/** @var string */
protected $quitReason;
public function __construct(Player $player, TranslationContainer|string $quitMessage, string $quitReason){
public function __construct(Player $player, Translatable|string $quitMessage, string $quitReason){
$this->player = $player;
$this->quitMessage = $quitMessage;
$this->quitReason = $quitReason;
}
public function setQuitMessage(TranslationContainer|string $quitMessage) : void{
public function setQuitMessage(Translatable|string $quitMessage) : void{
$this->quitMessage = $quitMessage;
}
public function getQuitMessage() : TranslationContainer|string{
public function getQuitMessage() : Translatable|string{
return $this->quitMessage;
}