mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-07-23 19:34:15 +00:00
Code Issues Projects Releases Wiki Activity

Updated some more hardcoded translation key usages missed by 94e16f416de31b79c93bdc2c6cf84b22d25ba63f

Browse Source
This commit is contained in:
Dylan K. Taylor 2021-06-30 14:02:55 +01:00
parent 76a74b3931
commit f3bd48e6cb
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
4 changed files with 29 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/command/defaults/GiveCommand.php
View File

@ -59,14 +59,14 @@ class GiveCommand extends VanillaCommand{
$player = $sender->getServer()->getPlayerByPrefix($args[0]); $player = $sender->getServer()->getPlayerByPrefix($args[0]);
if($player === null){ 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; return true;
} }
try{ try{
$item = LegacyStringToItemParser::getInstance()->parse($args[1]); $item = LegacyStringToItemParser::getInstance()->parse($args[1]);
}catch(\InvalidArgumentException $e){ }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; return true;
} }
@ -81,7 +81,7 @@ class GiveCommand extends VanillaCommand{
try{ try{
$tags = JsonNbtParser::parseJson($data); $tags = JsonNbtParser::parseJson($data);
}catch(NbtDataException $e){ }catch(NbtDataException $e){
$sender->sendMessage(new TranslationContainer("commands.give.tagError", [$e->getMessage()])); $sender->sendMessage(new TranslationContainer(KnownTranslationKeys::COMMANDS_GIVE_TAGERROR, [$e->getMessage()]));
return true; return true;
} }
@ -91,7 +91,7 @@ class GiveCommand extends VanillaCommand{
//TODO: overflow //TODO: overflow
$player->getInventory()->addItem(clone $item); $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() . ")", $item->getName() . " (" . $item->getId() . ":" . $item->getMeta() . ")",
(string) $item->getCount(), (string) $item->getCount(),
$player->getName() $player->getName()

5
src/command/defaults/VanillaCommand.php
View File

@ -26,6 +26,7 @@ namespace pocketmine\command\defaults;
use pocketmine\command\Command; use pocketmine\command\Command;
use pocketmine\command\CommandSender; use pocketmine\command\CommandSender;
use pocketmine\command\utils\InvalidCommandSyntaxException; use pocketmine\command\utils\InvalidCommandSyntaxException;
use pocketmine\lang\KnownTranslationKeys;
use pocketmine\lang\TranslationContainer; use pocketmine\lang\TranslationContainer;
use pocketmine\utils\TextFormat; use pocketmine\utils\TextFormat;
use function is_numeric; use function is_numeric;
@ -82,11 +83,11 @@ abstract class VanillaCommand extends Command{
$v = (int) $input; $v = (int) $input;
if($v > $max){ 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; return null;
} }
if($v < $min){ 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; return null;
} }

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

@ -30,6 +30,7 @@ use pocketmine\event\entity\EntityDamageByEntityEvent;
use pocketmine\event\entity\EntityDamageEvent; use pocketmine\event\entity\EntityDamageEvent;
use pocketmine\event\entity\EntityDeathEvent; use pocketmine\event\entity\EntityDeathEvent;
use pocketmine\item\Item; use pocketmine\item\Item;
use pocketmine\lang\KnownTranslationKeys;
use pocketmine\lang\TranslationContainer; use pocketmine\lang\TranslationContainer;
use pocketmine\player\Player; use pocketmine\player\Player;
@ -88,7 +89,7 @@ class PlayerDeathEvent extends EntityDeathEvent{
* Returns the vanilla death message for the given death cause. * 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) : TranslationContainer{
$message = "death.attack.generic"; $message = KnownTranslationKeys::DEATH_ATTACK_GENERIC;
$params = [$name]; $params = [$name];
switch($deathCause === null ? EntityDamageEvent::CAUSE_CUSTOM : $deathCause->getCause()){ switch($deathCause === null ? EntityDamageEvent::CAUSE_CUSTOM : $deathCause->getCause()){
@ -96,11 +97,11 @@ class PlayerDeathEvent extends EntityDeathEvent{
if($deathCause instanceof EntityDamageByEntityEvent){ if($deathCause instanceof EntityDamageByEntityEvent){
$e = $deathCause->getDamager(); $e = $deathCause->getDamager();
if($e instanceof Player){ if($e instanceof Player){
$message = "death.attack.player"; $message = KnownTranslationKeys::DEATH_ATTACK_PLAYER;
$params[] = $e->getDisplayName(); $params[] = $e->getDisplayName();
break; break;
}elseif($e instanceof Living){ }elseif($e instanceof Living){
$message = "death.attack.mob"; $message = KnownTranslationKeys::DEATH_ATTACK_MOB;
$params[] = $e->getNameTag() !== "" ? $e->getNameTag() : $e->getName(); $params[] = $e->getNameTag() !== "" ? $e->getNameTag() : $e->getName();
break; break;
}else{ }else{
@ -112,10 +113,10 @@ class PlayerDeathEvent extends EntityDeathEvent{
if($deathCause instanceof EntityDamageByEntityEvent){ if($deathCause instanceof EntityDamageByEntityEvent){
$e = $deathCause->getDamager(); $e = $deathCause->getDamager();
if($e instanceof Player){ if($e instanceof Player){
$message = "death.attack.arrow"; $message = KnownTranslationKeys::DEATH_ATTACK_ARROW;
$params[] = $e->getDisplayName(); $params[] = $e->getDisplayName();
}elseif($e instanceof Living){ }elseif($e instanceof Living){
$message = "death.attack.arrow"; $message = KnownTranslationKeys::DEATH_ATTACK_ARROW;
$params[] = $e->getNameTag() !== "" ? $e->getNameTag() : $e->getName(); $params[] = $e->getNameTag() !== "" ? $e->getNameTag() : $e->getName();
break; break;
}else{ }else{
@ -124,45 +125,45 @@ class PlayerDeathEvent extends EntityDeathEvent{
} }
break; break;
case EntityDamageEvent::CAUSE_SUICIDE: case EntityDamageEvent::CAUSE_SUICIDE:
$message = "death.attack.generic"; $message = KnownTranslationKeys::DEATH_ATTACK_GENERIC;
break; break;
case EntityDamageEvent::CAUSE_VOID: case EntityDamageEvent::CAUSE_VOID:
$message = "death.attack.outOfWorld"; $message = KnownTranslationKeys::DEATH_ATTACK_OUTOFWORLD;
break; break;
case EntityDamageEvent::CAUSE_FALL: case EntityDamageEvent::CAUSE_FALL:
if($deathCause instanceof EntityDamageEvent){ if($deathCause instanceof EntityDamageEvent){
if($deathCause->getFinalDamage() > 2){ if($deathCause->getFinalDamage() > 2){
$message = "death.fell.accident.generic"; $message = KnownTranslationKeys::DEATH_FELL_ACCIDENT_GENERIC;
break; break;
} }
} }
$message = "death.attack.fall"; $message = KnownTranslationKeys::DEATH_ATTACK_FALL;
break; break;
case EntityDamageEvent::CAUSE_SUFFOCATION: case EntityDamageEvent::CAUSE_SUFFOCATION:
$message = "death.attack.inWall"; $message = KnownTranslationKeys::DEATH_ATTACK_INWALL;
break; break;
case EntityDamageEvent::CAUSE_LAVA: case EntityDamageEvent::CAUSE_LAVA:
$message = "death.attack.lava"; $message = KnownTranslationKeys::DEATH_ATTACK_LAVA;
break; break;
case EntityDamageEvent::CAUSE_FIRE: case EntityDamageEvent::CAUSE_FIRE:
$message = "death.attack.onFire"; $message = KnownTranslationKeys::DEATH_ATTACK_ONFIRE;
break; break;
case EntityDamageEvent::CAUSE_FIRE_TICK: case EntityDamageEvent::CAUSE_FIRE_TICK:
$message = "death.attack.inFire"; $message = KnownTranslationKeys::DEATH_ATTACK_INFIRE;
break; break;
case EntityDamageEvent::CAUSE_DROWNING: case EntityDamageEvent::CAUSE_DROWNING:
$message = "death.attack.drown"; $message = KnownTranslationKeys::DEATH_ATTACK_DROWN;
break; break;
case EntityDamageEvent::CAUSE_CONTACT: case EntityDamageEvent::CAUSE_CONTACT:
if($deathCause instanceof EntityDamageByBlockEvent){ if($deathCause instanceof EntityDamageByBlockEvent){
if($deathCause->getDamager()->getId() === BlockLegacyIds::CACTUS){ if($deathCause->getDamager()->getId() === BlockLegacyIds::CACTUS){
$message = "death.attack.cactus"; $message = KnownTranslationKeys::DEATH_ATTACK_CACTUS;
} }
} }
break; break;
@ -172,20 +173,20 @@ class PlayerDeathEvent extends EntityDeathEvent{
if($deathCause instanceof EntityDamageByEntityEvent){ if($deathCause instanceof EntityDamageByEntityEvent){
$e = $deathCause->getDamager(); $e = $deathCause->getDamager();
if($e instanceof Player){ if($e instanceof Player){
$message = "death.attack.explosion.player"; $message = KnownTranslationKeys::DEATH_ATTACK_EXPLOSION_PLAYER;
$params[] = $e->getDisplayName(); $params[] = $e->getDisplayName();
}elseif($e instanceof Living){ }elseif($e instanceof Living){
$message = "death.attack.explosion.player"; $message = KnownTranslationKeys::DEATH_ATTACK_EXPLOSION_PLAYER;
$params[] = $e->getNameTag() !== "" ? $e->getNameTag() : $e->getName(); $params[] = $e->getNameTag() !== "" ? $e->getNameTag() : $e->getName();
break; break;
} }
}else{ }else{
$message = "death.attack.explosion"; $message = KnownTranslationKeys::DEATH_ATTACK_EXPLOSION;
} }
break; break;
case EntityDamageEvent::CAUSE_MAGIC: case EntityDamageEvent::CAUSE_MAGIC:
$message = "death.attack.magic"; $message = KnownTranslationKeys::DEATH_ATTACK_MAGIC;
break; break;
case EntityDamageEvent::CAUSE_CUSTOM: case EntityDamageEvent::CAUSE_CUSTOM:

4
src/player/Player.php
View File

@ -355,7 +355,7 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
*/ */
public function getLeaveMessage(){ public function getLeaveMessage(){
if($this->spawned){ if($this->spawned){
return new TranslationContainer(TextFormat::YELLOW . "%multiplayer.player.left", [ return new TranslationContainer(TextFormat::YELLOW . "%" . KnownTranslationKeys::MULTIPLAYER_PLAYER_LEFT, [
$this->getDisplayName() $this->getDisplayName()
]); ]);
} }
@ -799,7 +799,7 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
}); });
$ev = new PlayerJoinEvent($this, $ev = new PlayerJoinEvent($this,
new TranslationContainer(TextFormat::YELLOW . "%multiplayer.player.joined", [ new TranslationContainer(TextFormat::YELLOW . "%" . KnownTranslationKeys::MULTIPLAYER_PLAYER_JOINED, [
$this->getDisplayName() $this->getDisplayName()
]) ])
); );