diff --git a/src/command/defaults/GiveCommand.php b/src/command/defaults/GiveCommand.php index aa23475f9..9637937e3 100644 --- a/src/command/defaults/GiveCommand.php +++ b/src/command/defaults/GiveCommand.php @@ -59,14 +59,14 @@ class GiveCommand extends VanillaCommand{ $player = $sender->getServer()->getPlayerByPrefix($args[0]); if($player === null){ - $sender->sendMessage(new TranslationContainer(TextFormat::RED . "%commands.generic.player.notFound")); + $sender->sendMessage(new TranslationContainer(TextFormat::RED . "%" . KnownTranslationKeys::COMMANDS_GENERIC_PLAYER_NOTFOUND)); return true; } try{ $item = LegacyStringToItemParser::getInstance()->parse($args[1]); }catch(\InvalidArgumentException $e){ - $sender->sendMessage(new TranslationContainer(TextFormat::RED . "%commands.give.item.notFound", [$args[1]])); + $sender->sendMessage(new TranslationContainer(TextFormat::RED . "%" . KnownTranslationKeys::COMMANDS_GIVE_ITEM_NOTFOUND, [$args[1]])); return true; } @@ -81,7 +81,7 @@ class GiveCommand extends VanillaCommand{ try{ $tags = JsonNbtParser::parseJson($data); }catch(NbtDataException $e){ - $sender->sendMessage(new TranslationContainer("commands.give.tagError", [$e->getMessage()])); + $sender->sendMessage(new TranslationContainer(KnownTranslationKeys::COMMANDS_GIVE_TAGERROR, [$e->getMessage()])); return true; } @@ -91,7 +91,7 @@ class GiveCommand extends VanillaCommand{ //TODO: overflow $player->getInventory()->addItem(clone $item); - Command::broadcastCommandMessage($sender, new TranslationContainer("%commands.give.success", [ + Command::broadcastCommandMessage($sender, new TranslationContainer(KnownTranslationKeys::COMMANDS_GIVE_SUCCESS, [ $item->getName() . " (" . $item->getId() . ":" . $item->getMeta() . ")", (string) $item->getCount(), $player->getName() diff --git a/src/command/defaults/VanillaCommand.php b/src/command/defaults/VanillaCommand.php index c4b821e6d..b12ccf278 100644 --- a/src/command/defaults/VanillaCommand.php +++ b/src/command/defaults/VanillaCommand.php @@ -26,6 +26,7 @@ namespace pocketmine\command\defaults; use pocketmine\command\Command; use pocketmine\command\CommandSender; use pocketmine\command\utils\InvalidCommandSyntaxException; +use pocketmine\lang\KnownTranslationKeys; use pocketmine\lang\TranslationContainer; use pocketmine\utils\TextFormat; use function is_numeric; @@ -82,11 +83,11 @@ abstract class VanillaCommand extends Command{ $v = (int) $input; if($v > $max){ - $sender->sendMessage(new TranslationContainer(TextFormat::RED . "%commands.generic.num.tooBig", [$input, (string) $max])); + $sender->sendMessage(new TranslationContainer(TextFormat::RED . "%" . KnownTranslationKeys::COMMANDS_GENERIC_NUM_TOOBIG, [$input, (string) $max])); return null; } if($v < $min){ - $sender->sendMessage(new TranslationContainer(TextFormat::RED . "%commands.generic.num.tooSmall", [$input, (string) $min])); + $sender->sendMessage(new TranslationContainer(TextFormat::RED . "%" . KnownTranslationKeys::COMMANDS_GENERIC_NUM_TOOSMALL, [$input, (string) $min])); return null; } diff --git a/src/event/player/PlayerDeathEvent.php b/src/event/player/PlayerDeathEvent.php index acfa86a7e..c33f3ee0d 100644 --- a/src/event/player/PlayerDeathEvent.php +++ b/src/event/player/PlayerDeathEvent.php @@ -30,6 +30,7 @@ use pocketmine\event\entity\EntityDamageByEntityEvent; use pocketmine\event\entity\EntityDamageEvent; use pocketmine\event\entity\EntityDeathEvent; use pocketmine\item\Item; +use pocketmine\lang\KnownTranslationKeys; use pocketmine\lang\TranslationContainer; use pocketmine\player\Player; @@ -88,7 +89,7 @@ class PlayerDeathEvent extends EntityDeathEvent{ * Returns the vanilla death message for the given death cause. */ public static function deriveMessage(string $name, ?EntityDamageEvent $deathCause) : TranslationContainer{ - $message = "death.attack.generic"; + $message = KnownTranslationKeys::DEATH_ATTACK_GENERIC; $params = [$name]; switch($deathCause === null ? EntityDamageEvent::CAUSE_CUSTOM : $deathCause->getCause()){ @@ -96,11 +97,11 @@ class PlayerDeathEvent extends EntityDeathEvent{ if($deathCause instanceof EntityDamageByEntityEvent){ $e = $deathCause->getDamager(); if($e instanceof Player){ - $message = "death.attack.player"; + $message = KnownTranslationKeys::DEATH_ATTACK_PLAYER; $params[] = $e->getDisplayName(); break; }elseif($e instanceof Living){ - $message = "death.attack.mob"; + $message = KnownTranslationKeys::DEATH_ATTACK_MOB; $params[] = $e->getNameTag() !== "" ? $e->getNameTag() : $e->getName(); break; }else{ @@ -112,10 +113,10 @@ class PlayerDeathEvent extends EntityDeathEvent{ if($deathCause instanceof EntityDamageByEntityEvent){ $e = $deathCause->getDamager(); if($e instanceof Player){ - $message = "death.attack.arrow"; + $message = KnownTranslationKeys::DEATH_ATTACK_ARROW; $params[] = $e->getDisplayName(); }elseif($e instanceof Living){ - $message = "death.attack.arrow"; + $message = KnownTranslationKeys::DEATH_ATTACK_ARROW; $params[] = $e->getNameTag() !== "" ? $e->getNameTag() : $e->getName(); break; }else{ @@ -124,45 +125,45 @@ class PlayerDeathEvent extends EntityDeathEvent{ } break; case EntityDamageEvent::CAUSE_SUICIDE: - $message = "death.attack.generic"; + $message = KnownTranslationKeys::DEATH_ATTACK_GENERIC; break; case EntityDamageEvent::CAUSE_VOID: - $message = "death.attack.outOfWorld"; + $message = KnownTranslationKeys::DEATH_ATTACK_OUTOFWORLD; break; case EntityDamageEvent::CAUSE_FALL: if($deathCause instanceof EntityDamageEvent){ if($deathCause->getFinalDamage() > 2){ - $message = "death.fell.accident.generic"; + $message = KnownTranslationKeys::DEATH_FELL_ACCIDENT_GENERIC; break; } } - $message = "death.attack.fall"; + $message = KnownTranslationKeys::DEATH_ATTACK_FALL; break; case EntityDamageEvent::CAUSE_SUFFOCATION: - $message = "death.attack.inWall"; + $message = KnownTranslationKeys::DEATH_ATTACK_INWALL; break; case EntityDamageEvent::CAUSE_LAVA: - $message = "death.attack.lava"; + $message = KnownTranslationKeys::DEATH_ATTACK_LAVA; break; case EntityDamageEvent::CAUSE_FIRE: - $message = "death.attack.onFire"; + $message = KnownTranslationKeys::DEATH_ATTACK_ONFIRE; break; case EntityDamageEvent::CAUSE_FIRE_TICK: - $message = "death.attack.inFire"; + $message = KnownTranslationKeys::DEATH_ATTACK_INFIRE; break; case EntityDamageEvent::CAUSE_DROWNING: - $message = "death.attack.drown"; + $message = KnownTranslationKeys::DEATH_ATTACK_DROWN; break; case EntityDamageEvent::CAUSE_CONTACT: if($deathCause instanceof EntityDamageByBlockEvent){ if($deathCause->getDamager()->getId() === BlockLegacyIds::CACTUS){ - $message = "death.attack.cactus"; + $message = KnownTranslationKeys::DEATH_ATTACK_CACTUS; } } break; @@ -172,20 +173,20 @@ class PlayerDeathEvent extends EntityDeathEvent{ if($deathCause instanceof EntityDamageByEntityEvent){ $e = $deathCause->getDamager(); if($e instanceof Player){ - $message = "death.attack.explosion.player"; + $message = KnownTranslationKeys::DEATH_ATTACK_EXPLOSION_PLAYER; $params[] = $e->getDisplayName(); }elseif($e instanceof Living){ - $message = "death.attack.explosion.player"; + $message = KnownTranslationKeys::DEATH_ATTACK_EXPLOSION_PLAYER; $params[] = $e->getNameTag() !== "" ? $e->getNameTag() : $e->getName(); break; } }else{ - $message = "death.attack.explosion"; + $message = KnownTranslationKeys::DEATH_ATTACK_EXPLOSION; } break; case EntityDamageEvent::CAUSE_MAGIC: - $message = "death.attack.magic"; + $message = KnownTranslationKeys::DEATH_ATTACK_MAGIC; break; case EntityDamageEvent::CAUSE_CUSTOM: diff --git a/src/player/Player.php b/src/player/Player.php index 3e626fed3..ddc418a78 100644 --- a/src/player/Player.php +++ b/src/player/Player.php @@ -355,7 +355,7 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{ */ public function getLeaveMessage(){ if($this->spawned){ - return new TranslationContainer(TextFormat::YELLOW . "%multiplayer.player.left", [ + return new TranslationContainer(TextFormat::YELLOW . "%" . KnownTranslationKeys::MULTIPLAYER_PLAYER_LEFT, [ $this->getDisplayName() ]); } @@ -799,7 +799,7 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{ }); $ev = new PlayerJoinEvent($this, - new TranslationContainer(TextFormat::YELLOW . "%multiplayer.player.joined", [ + new TranslationContainer(TextFormat::YELLOW . "%" . KnownTranslationKeys::MULTIPLAYER_PLAYER_JOINED, [ $this->getDisplayName() ]) );