From 906d7eb1767401e1b925712cd5f0ba1871acdd0d Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Sun, 4 Feb 2018 20:03:30 +0000 Subject: [PATCH] Lang: Move TranslationContainer and TextContainer to \pocketmine\lang namespace why the hell were they ever put in \pocketmine\event in the first place?? This change was suggested many months ago but I forgot all about it. --- src/pocketmine/Achievement.php | 2 +- src/pocketmine/Player.php | 4 ++-- src/pocketmine/Server.php | 2 +- src/pocketmine/block/Bed.php | 2 +- src/pocketmine/command/Command.php | 4 ++-- src/pocketmine/command/CommandSender.php | 2 +- src/pocketmine/command/ConsoleCommandSender.php | 2 +- src/pocketmine/command/FormattedCommandAlias.php | 2 +- src/pocketmine/command/RemoteConsoleCommandSender.php | 2 +- src/pocketmine/command/SimpleCommandMap.php | 2 +- src/pocketmine/command/defaults/BanCommand.php | 2 +- src/pocketmine/command/defaults/BanIpCommand.php | 2 +- src/pocketmine/command/defaults/BanListCommand.php | 2 +- src/pocketmine/command/defaults/DefaultGamemodeCommand.php | 2 +- src/pocketmine/command/defaults/DeopCommand.php | 2 +- src/pocketmine/command/defaults/DifficultyCommand.php | 2 +- src/pocketmine/command/defaults/EffectCommand.php | 2 +- src/pocketmine/command/defaults/EnchantCommand.php | 2 +- src/pocketmine/command/defaults/GamemodeCommand.php | 2 +- src/pocketmine/command/defaults/GiveCommand.php | 2 +- src/pocketmine/command/defaults/HelpCommand.php | 2 +- src/pocketmine/command/defaults/KickCommand.php | 2 +- src/pocketmine/command/defaults/KillCommand.php | 2 +- src/pocketmine/command/defaults/ListCommand.php | 2 +- src/pocketmine/command/defaults/MeCommand.php | 2 +- src/pocketmine/command/defaults/OpCommand.php | 2 +- src/pocketmine/command/defaults/PardonCommand.php | 2 +- src/pocketmine/command/defaults/PardonIpCommand.php | 2 +- src/pocketmine/command/defaults/ParticleCommand.php | 2 +- src/pocketmine/command/defaults/PluginsCommand.php | 2 +- src/pocketmine/command/defaults/ReloadCommand.php | 2 +- src/pocketmine/command/defaults/SaveCommand.php | 2 +- src/pocketmine/command/defaults/SaveOffCommand.php | 2 +- src/pocketmine/command/defaults/SaveOnCommand.php | 2 +- src/pocketmine/command/defaults/SayCommand.php | 2 +- src/pocketmine/command/defaults/SeedCommand.php | 2 +- src/pocketmine/command/defaults/SetWorldSpawnCommand.php | 2 +- src/pocketmine/command/defaults/SpawnpointCommand.php | 2 +- src/pocketmine/command/defaults/StopCommand.php | 2 +- src/pocketmine/command/defaults/TeleportCommand.php | 2 +- src/pocketmine/command/defaults/TellCommand.php | 2 +- src/pocketmine/command/defaults/TimeCommand.php | 2 +- src/pocketmine/command/defaults/TimingsCommand.php | 2 +- src/pocketmine/command/defaults/TitleCommand.php | 2 +- src/pocketmine/command/defaults/VersionCommand.php | 2 +- src/pocketmine/command/defaults/WhitelistCommand.php | 2 +- src/pocketmine/event/player/PlayerDeathEvent.php | 2 +- src/pocketmine/event/player/PlayerJoinEvent.php | 2 +- src/pocketmine/event/player/PlayerKickEvent.php | 2 +- src/pocketmine/event/player/PlayerQuitEvent.php | 2 +- src/pocketmine/lang/BaseLang.php | 2 -- src/pocketmine/{event => lang}/TextContainer.php | 2 +- src/pocketmine/{event => lang}/TranslationContainer.php | 2 +- 53 files changed, 54 insertions(+), 56 deletions(-) rename src/pocketmine/{event => lang}/TextContainer.php (97%) rename src/pocketmine/{event => lang}/TranslationContainer.php (98%) diff --git a/src/pocketmine/Achievement.php b/src/pocketmine/Achievement.php index 273ed5803..7936b204a 100644 --- a/src/pocketmine/Achievement.php +++ b/src/pocketmine/Achievement.php @@ -23,7 +23,7 @@ declare(strict_types=1); namespace pocketmine; -use pocketmine\event\TranslationContainer; +use pocketmine\lang\TranslationContainer; use pocketmine\utils\TextFormat; /** diff --git a/src/pocketmine/Player.php b/src/pocketmine/Player.php index dac695b85..4a957fd16 100644 --- a/src/pocketmine/Player.php +++ b/src/pocketmine/Player.php @@ -67,9 +67,7 @@ use pocketmine\event\player\PlayerToggleSneakEvent; use pocketmine\event\player\PlayerToggleSprintEvent; use pocketmine\event\player\PlayerTransferEvent; use pocketmine\event\server\DataPacketSendEvent; -use pocketmine\event\TextContainer; use pocketmine\event\Timings; -use pocketmine\event\TranslationContainer; use pocketmine\inventory\BigCraftingGrid; use pocketmine\inventory\CraftingGrid; use pocketmine\inventory\Inventory; @@ -81,6 +79,8 @@ use pocketmine\item\Consumable; use pocketmine\item\Item; use pocketmine\item\WritableBook; use pocketmine\item\WrittenBook; +use pocketmine\lang\TextContainer; +use pocketmine\lang\TranslationContainer; use pocketmine\level\ChunkLoader; use pocketmine\level\format\Chunk; use pocketmine\level\Level; diff --git a/src/pocketmine/Server.php b/src/pocketmine/Server.php index 88ba438f7..3daa7693c 100644 --- a/src/pocketmine/Server.php +++ b/src/pocketmine/Server.php @@ -43,7 +43,6 @@ use pocketmine\event\level\LevelLoadEvent; use pocketmine\event\player\PlayerDataSaveEvent; use pocketmine\event\server\QueryRegenerateEvent; use pocketmine\event\server\ServerCommandEvent; -use pocketmine\event\TextContainer; use pocketmine\event\Timings; use pocketmine\event\TimingsHandler; use pocketmine\inventory\CraftingManager; @@ -51,6 +50,7 @@ use pocketmine\inventory\Recipe; use pocketmine\item\enchantment\Enchantment; use pocketmine\item\ItemFactory; use pocketmine\lang\BaseLang; +use pocketmine\lang\TextContainer; use pocketmine\level\format\io\leveldb\LevelDB; use pocketmine\level\format\io\LevelProvider; use pocketmine\level\format\io\LevelProviderManager; diff --git a/src/pocketmine/block/Bed.php b/src/pocketmine/block/Bed.php index 8f7b6102f..cf13accf6 100644 --- a/src/pocketmine/block/Bed.php +++ b/src/pocketmine/block/Bed.php @@ -23,9 +23,9 @@ declare(strict_types=1); namespace pocketmine\block; -use pocketmine\event\TranslationContainer; use pocketmine\item\Item; use pocketmine\item\ItemFactory; +use pocketmine\lang\TranslationContainer; use pocketmine\level\Level; use pocketmine\math\AxisAlignedBB; use pocketmine\math\Vector3; diff --git a/src/pocketmine/command/Command.php b/src/pocketmine/command/Command.php index df7e1aa19..4f2a50992 100644 --- a/src/pocketmine/command/Command.php +++ b/src/pocketmine/command/Command.php @@ -26,9 +26,9 @@ declare(strict_types=1); */ namespace pocketmine\command; -use pocketmine\event\TextContainer; use pocketmine\event\TimingsHandler; -use pocketmine\event\TranslationContainer; +use pocketmine\lang\TextContainer; +use pocketmine\lang\TranslationContainer; use pocketmine\Server; use pocketmine\utils\TextFormat; diff --git a/src/pocketmine/command/CommandSender.php b/src/pocketmine/command/CommandSender.php index 309f56c5c..e64728ce0 100644 --- a/src/pocketmine/command/CommandSender.php +++ b/src/pocketmine/command/CommandSender.php @@ -23,7 +23,7 @@ declare(strict_types=1); namespace pocketmine\command; -use pocketmine\event\TextContainer; +use pocketmine\lang\TextContainer; use pocketmine\permission\Permissible; use pocketmine\Server; diff --git a/src/pocketmine/command/ConsoleCommandSender.php b/src/pocketmine/command/ConsoleCommandSender.php index 3ea365b85..0c757cb9e 100644 --- a/src/pocketmine/command/ConsoleCommandSender.php +++ b/src/pocketmine/command/ConsoleCommandSender.php @@ -23,7 +23,7 @@ declare(strict_types=1); namespace pocketmine\command; -use pocketmine\event\TextContainer; +use pocketmine\lang\TextContainer; use pocketmine\permission\PermissibleBase; use pocketmine\permission\Permission; use pocketmine\permission\PermissionAttachment; diff --git a/src/pocketmine/command/FormattedCommandAlias.php b/src/pocketmine/command/FormattedCommandAlias.php index 7f70cb535..926b409bc 100644 --- a/src/pocketmine/command/FormattedCommandAlias.php +++ b/src/pocketmine/command/FormattedCommandAlias.php @@ -23,7 +23,7 @@ declare(strict_types=1); namespace pocketmine\command; -use pocketmine\event\TranslationContainer; +use pocketmine\lang\TranslationContainer; use pocketmine\Server; use pocketmine\utils\TextFormat; diff --git a/src/pocketmine/command/RemoteConsoleCommandSender.php b/src/pocketmine/command/RemoteConsoleCommandSender.php index c02e136a8..c4ff17e68 100644 --- a/src/pocketmine/command/RemoteConsoleCommandSender.php +++ b/src/pocketmine/command/RemoteConsoleCommandSender.php @@ -23,7 +23,7 @@ declare(strict_types=1); namespace pocketmine\command; -use pocketmine\event\TextContainer; +use pocketmine\lang\TextContainer; class RemoteConsoleCommandSender extends ConsoleCommandSender{ diff --git a/src/pocketmine/command/SimpleCommandMap.php b/src/pocketmine/command/SimpleCommandMap.php index d599ad7d4..c07da3cf8 100644 --- a/src/pocketmine/command/SimpleCommandMap.php +++ b/src/pocketmine/command/SimpleCommandMap.php @@ -65,7 +65,7 @@ use pocketmine\command\defaults\VanillaCommand; use pocketmine\command\defaults\VersionCommand; use pocketmine\command\defaults\WhitelistCommand; use pocketmine\command\utils\InvalidCommandSyntaxException; -use pocketmine\event\TranslationContainer; +use pocketmine\lang\TranslationContainer; use pocketmine\Server; use pocketmine\utils\TextFormat; diff --git a/src/pocketmine/command/defaults/BanCommand.php b/src/pocketmine/command/defaults/BanCommand.php index 0bd37aa7c..c05223027 100644 --- a/src/pocketmine/command/defaults/BanCommand.php +++ b/src/pocketmine/command/defaults/BanCommand.php @@ -26,7 +26,7 @@ namespace pocketmine\command\defaults; use pocketmine\command\Command; use pocketmine\command\CommandSender; use pocketmine\command\utils\InvalidCommandSyntaxException; -use pocketmine\event\TranslationContainer; +use pocketmine\lang\TranslationContainer; use pocketmine\Player; class BanCommand extends VanillaCommand{ diff --git a/src/pocketmine/command/defaults/BanIpCommand.php b/src/pocketmine/command/defaults/BanIpCommand.php index a0e694d01..af35f7f7c 100644 --- a/src/pocketmine/command/defaults/BanIpCommand.php +++ b/src/pocketmine/command/defaults/BanIpCommand.php @@ -26,7 +26,7 @@ namespace pocketmine\command\defaults; use pocketmine\command\Command; use pocketmine\command\CommandSender; use pocketmine\command\utils\InvalidCommandSyntaxException; -use pocketmine\event\TranslationContainer; +use pocketmine\lang\TranslationContainer; use pocketmine\Player; class BanIpCommand extends VanillaCommand{ diff --git a/src/pocketmine/command/defaults/BanListCommand.php b/src/pocketmine/command/defaults/BanListCommand.php index b02b0e1fc..67d2b9104 100644 --- a/src/pocketmine/command/defaults/BanListCommand.php +++ b/src/pocketmine/command/defaults/BanListCommand.php @@ -25,7 +25,7 @@ namespace pocketmine\command\defaults; use pocketmine\command\CommandSender; use pocketmine\command\utils\InvalidCommandSyntaxException; -use pocketmine\event\TranslationContainer; +use pocketmine\lang\TranslationContainer; use pocketmine\permission\BanEntry; class BanListCommand extends VanillaCommand{ diff --git a/src/pocketmine/command/defaults/DefaultGamemodeCommand.php b/src/pocketmine/command/defaults/DefaultGamemodeCommand.php index 47329b3c3..913619f0f 100644 --- a/src/pocketmine/command/defaults/DefaultGamemodeCommand.php +++ b/src/pocketmine/command/defaults/DefaultGamemodeCommand.php @@ -25,7 +25,7 @@ namespace pocketmine\command\defaults; use pocketmine\command\CommandSender; use pocketmine\command\utils\InvalidCommandSyntaxException; -use pocketmine\event\TranslationContainer; +use pocketmine\lang\TranslationContainer; use pocketmine\Server; class DefaultGamemodeCommand extends VanillaCommand{ diff --git a/src/pocketmine/command/defaults/DeopCommand.php b/src/pocketmine/command/defaults/DeopCommand.php index c611325b3..0cefb3c46 100644 --- a/src/pocketmine/command/defaults/DeopCommand.php +++ b/src/pocketmine/command/defaults/DeopCommand.php @@ -26,7 +26,7 @@ namespace pocketmine\command\defaults; use pocketmine\command\Command; use pocketmine\command\CommandSender; use pocketmine\command\utils\InvalidCommandSyntaxException; -use pocketmine\event\TranslationContainer; +use pocketmine\lang\TranslationContainer; use pocketmine\Player; use pocketmine\utils\TextFormat; diff --git a/src/pocketmine/command/defaults/DifficultyCommand.php b/src/pocketmine/command/defaults/DifficultyCommand.php index ff91af5e1..9146437c3 100644 --- a/src/pocketmine/command/defaults/DifficultyCommand.php +++ b/src/pocketmine/command/defaults/DifficultyCommand.php @@ -26,7 +26,7 @@ namespace pocketmine\command\defaults; use pocketmine\command\Command; use pocketmine\command\CommandSender; use pocketmine\command\utils\InvalidCommandSyntaxException; -use pocketmine\event\TranslationContainer; +use pocketmine\lang\TranslationContainer; use pocketmine\level\Level; class DifficultyCommand extends VanillaCommand{ diff --git a/src/pocketmine/command/defaults/EffectCommand.php b/src/pocketmine/command/defaults/EffectCommand.php index e4cbb7e8e..5ae33e25c 100644 --- a/src/pocketmine/command/defaults/EffectCommand.php +++ b/src/pocketmine/command/defaults/EffectCommand.php @@ -26,7 +26,7 @@ namespace pocketmine\command\defaults; use pocketmine\command\CommandSender; use pocketmine\command\utils\InvalidCommandSyntaxException; use pocketmine\entity\Effect; -use pocketmine\event\TranslationContainer; +use pocketmine\lang\TranslationContainer; use pocketmine\utils\TextFormat; class EffectCommand extends VanillaCommand{ diff --git a/src/pocketmine/command/defaults/EnchantCommand.php b/src/pocketmine/command/defaults/EnchantCommand.php index a64dc1be3..f9adc0b09 100644 --- a/src/pocketmine/command/defaults/EnchantCommand.php +++ b/src/pocketmine/command/defaults/EnchantCommand.php @@ -25,9 +25,9 @@ namespace pocketmine\command\defaults; use pocketmine\command\CommandSender; use pocketmine\command\utils\InvalidCommandSyntaxException; -use pocketmine\event\TranslationContainer; use pocketmine\item\enchantment\Enchantment; use pocketmine\item\enchantment\EnchantmentInstance; +use pocketmine\lang\TranslationContainer; use pocketmine\utils\TextFormat; class EnchantCommand extends VanillaCommand{ diff --git a/src/pocketmine/command/defaults/GamemodeCommand.php b/src/pocketmine/command/defaults/GamemodeCommand.php index 8b350f2b4..b4cb06e9f 100644 --- a/src/pocketmine/command/defaults/GamemodeCommand.php +++ b/src/pocketmine/command/defaults/GamemodeCommand.php @@ -26,7 +26,7 @@ namespace pocketmine\command\defaults; use pocketmine\command\Command; use pocketmine\command\CommandSender; use pocketmine\command\utils\InvalidCommandSyntaxException; -use pocketmine\event\TranslationContainer; +use pocketmine\lang\TranslationContainer; use pocketmine\Player; use pocketmine\Server; use pocketmine\utils\TextFormat; diff --git a/src/pocketmine/command/defaults/GiveCommand.php b/src/pocketmine/command/defaults/GiveCommand.php index 94c19a8f7..5b84b6bd8 100644 --- a/src/pocketmine/command/defaults/GiveCommand.php +++ b/src/pocketmine/command/defaults/GiveCommand.php @@ -26,8 +26,8 @@ namespace pocketmine\command\defaults; use pocketmine\command\Command; use pocketmine\command\CommandSender; use pocketmine\command\utils\InvalidCommandSyntaxException; -use pocketmine\event\TranslationContainer; use pocketmine\item\ItemFactory; +use pocketmine\lang\TranslationContainer; use pocketmine\nbt\JsonNBTParser; use pocketmine\nbt\tag\CompoundTag; use pocketmine\Player; diff --git a/src/pocketmine/command/defaults/HelpCommand.php b/src/pocketmine/command/defaults/HelpCommand.php index bc7ca1353..2a7e18f92 100644 --- a/src/pocketmine/command/defaults/HelpCommand.php +++ b/src/pocketmine/command/defaults/HelpCommand.php @@ -25,7 +25,7 @@ namespace pocketmine\command\defaults; use pocketmine\command\Command; use pocketmine\command\CommandSender; -use pocketmine\event\TranslationContainer; +use pocketmine\lang\TranslationContainer; use pocketmine\utils\TextFormat; class HelpCommand extends VanillaCommand{ diff --git a/src/pocketmine/command/defaults/KickCommand.php b/src/pocketmine/command/defaults/KickCommand.php index 543d6f915..4b4b98599 100644 --- a/src/pocketmine/command/defaults/KickCommand.php +++ b/src/pocketmine/command/defaults/KickCommand.php @@ -26,7 +26,7 @@ namespace pocketmine\command\defaults; use pocketmine\command\Command; use pocketmine\command\CommandSender; use pocketmine\command\utils\InvalidCommandSyntaxException; -use pocketmine\event\TranslationContainer; +use pocketmine\lang\TranslationContainer; use pocketmine\Player; use pocketmine\utils\TextFormat; diff --git a/src/pocketmine/command/defaults/KillCommand.php b/src/pocketmine/command/defaults/KillCommand.php index f661879e1..8842af1e5 100644 --- a/src/pocketmine/command/defaults/KillCommand.php +++ b/src/pocketmine/command/defaults/KillCommand.php @@ -27,7 +27,7 @@ use pocketmine\command\Command; use pocketmine\command\CommandSender; use pocketmine\command\utils\InvalidCommandSyntaxException; use pocketmine\event\entity\EntityDamageEvent; -use pocketmine\event\TranslationContainer; +use pocketmine\lang\TranslationContainer; use pocketmine\Player; use pocketmine\utils\TextFormat; diff --git a/src/pocketmine/command/defaults/ListCommand.php b/src/pocketmine/command/defaults/ListCommand.php index fce4284f0..c7b1e0857 100644 --- a/src/pocketmine/command/defaults/ListCommand.php +++ b/src/pocketmine/command/defaults/ListCommand.php @@ -24,7 +24,7 @@ declare(strict_types=1); namespace pocketmine\command\defaults; use pocketmine\command\CommandSender; -use pocketmine\event\TranslationContainer; +use pocketmine\lang\TranslationContainer; use pocketmine\Player; class ListCommand extends VanillaCommand{ diff --git a/src/pocketmine/command/defaults/MeCommand.php b/src/pocketmine/command/defaults/MeCommand.php index ed3ed0fc1..b3c89cd1f 100644 --- a/src/pocketmine/command/defaults/MeCommand.php +++ b/src/pocketmine/command/defaults/MeCommand.php @@ -25,7 +25,7 @@ namespace pocketmine\command\defaults; use pocketmine\command\CommandSender; use pocketmine\command\utils\InvalidCommandSyntaxException; -use pocketmine\event\TranslationContainer; +use pocketmine\lang\TranslationContainer; use pocketmine\Player; use pocketmine\utils\TextFormat; diff --git a/src/pocketmine/command/defaults/OpCommand.php b/src/pocketmine/command/defaults/OpCommand.php index 1819335a4..7544bd461 100644 --- a/src/pocketmine/command/defaults/OpCommand.php +++ b/src/pocketmine/command/defaults/OpCommand.php @@ -26,7 +26,7 @@ namespace pocketmine\command\defaults; use pocketmine\command\Command; use pocketmine\command\CommandSender; use pocketmine\command\utils\InvalidCommandSyntaxException; -use pocketmine\event\TranslationContainer; +use pocketmine\lang\TranslationContainer; use pocketmine\Player; use pocketmine\utils\TextFormat; diff --git a/src/pocketmine/command/defaults/PardonCommand.php b/src/pocketmine/command/defaults/PardonCommand.php index 406745d6c..a90ef479a 100644 --- a/src/pocketmine/command/defaults/PardonCommand.php +++ b/src/pocketmine/command/defaults/PardonCommand.php @@ -26,7 +26,7 @@ namespace pocketmine\command\defaults; use pocketmine\command\Command; use pocketmine\command\CommandSender; use pocketmine\command\utils\InvalidCommandSyntaxException; -use pocketmine\event\TranslationContainer; +use pocketmine\lang\TranslationContainer; class PardonCommand extends VanillaCommand{ diff --git a/src/pocketmine/command/defaults/PardonIpCommand.php b/src/pocketmine/command/defaults/PardonIpCommand.php index 8e30fb4fd..8d42ccabb 100644 --- a/src/pocketmine/command/defaults/PardonIpCommand.php +++ b/src/pocketmine/command/defaults/PardonIpCommand.php @@ -26,7 +26,7 @@ namespace pocketmine\command\defaults; use pocketmine\command\Command; use pocketmine\command\CommandSender; use pocketmine\command\utils\InvalidCommandSyntaxException; -use pocketmine\event\TranslationContainer; +use pocketmine\lang\TranslationContainer; class PardonIpCommand extends VanillaCommand{ diff --git a/src/pocketmine/command/defaults/ParticleCommand.php b/src/pocketmine/command/defaults/ParticleCommand.php index 3a19705a0..ca50022a7 100644 --- a/src/pocketmine/command/defaults/ParticleCommand.php +++ b/src/pocketmine/command/defaults/ParticleCommand.php @@ -26,9 +26,9 @@ namespace pocketmine\command\defaults; use pocketmine\block\BlockFactory; use pocketmine\command\CommandSender; use pocketmine\command\utils\InvalidCommandSyntaxException; -use pocketmine\event\TranslationContainer; use pocketmine\item\Item; use pocketmine\item\ItemFactory; +use pocketmine\lang\TranslationContainer; use pocketmine\level\particle\AngryVillagerParticle; use pocketmine\level\particle\BlockForceFieldParticle; use pocketmine\level\particle\BubbleParticle; diff --git a/src/pocketmine/command/defaults/PluginsCommand.php b/src/pocketmine/command/defaults/PluginsCommand.php index e93281100..c86a59286 100644 --- a/src/pocketmine/command/defaults/PluginsCommand.php +++ b/src/pocketmine/command/defaults/PluginsCommand.php @@ -24,7 +24,7 @@ declare(strict_types=1); namespace pocketmine\command\defaults; use pocketmine\command\CommandSender; -use pocketmine\event\TranslationContainer; +use pocketmine\lang\TranslationContainer; use pocketmine\utils\TextFormat; class PluginsCommand extends VanillaCommand{ diff --git a/src/pocketmine/command/defaults/ReloadCommand.php b/src/pocketmine/command/defaults/ReloadCommand.php index b601c1932..33e498ac8 100644 --- a/src/pocketmine/command/defaults/ReloadCommand.php +++ b/src/pocketmine/command/defaults/ReloadCommand.php @@ -25,7 +25,7 @@ namespace pocketmine\command\defaults; use pocketmine\command\Command; use pocketmine\command\CommandSender; -use pocketmine\event\TranslationContainer; +use pocketmine\lang\TranslationContainer; use pocketmine\utils\TextFormat; class ReloadCommand extends VanillaCommand{ diff --git a/src/pocketmine/command/defaults/SaveCommand.php b/src/pocketmine/command/defaults/SaveCommand.php index 296c15e52..a52eabcfc 100644 --- a/src/pocketmine/command/defaults/SaveCommand.php +++ b/src/pocketmine/command/defaults/SaveCommand.php @@ -25,7 +25,7 @@ namespace pocketmine\command\defaults; use pocketmine\command\Command; use pocketmine\command\CommandSender; -use pocketmine\event\TranslationContainer; +use pocketmine\lang\TranslationContainer; class SaveCommand extends VanillaCommand{ diff --git a/src/pocketmine/command/defaults/SaveOffCommand.php b/src/pocketmine/command/defaults/SaveOffCommand.php index c7e11b6f4..c81d16905 100644 --- a/src/pocketmine/command/defaults/SaveOffCommand.php +++ b/src/pocketmine/command/defaults/SaveOffCommand.php @@ -25,7 +25,7 @@ namespace pocketmine\command\defaults; use pocketmine\command\Command; use pocketmine\command\CommandSender; -use pocketmine\event\TranslationContainer; +use pocketmine\lang\TranslationContainer; class SaveOffCommand extends VanillaCommand{ diff --git a/src/pocketmine/command/defaults/SaveOnCommand.php b/src/pocketmine/command/defaults/SaveOnCommand.php index 702863b23..8962baa2b 100644 --- a/src/pocketmine/command/defaults/SaveOnCommand.php +++ b/src/pocketmine/command/defaults/SaveOnCommand.php @@ -25,7 +25,7 @@ namespace pocketmine\command\defaults; use pocketmine\command\Command; use pocketmine\command\CommandSender; -use pocketmine\event\TranslationContainer; +use pocketmine\lang\TranslationContainer; class SaveOnCommand extends VanillaCommand{ diff --git a/src/pocketmine/command/defaults/SayCommand.php b/src/pocketmine/command/defaults/SayCommand.php index 2870d5573..782ae3073 100644 --- a/src/pocketmine/command/defaults/SayCommand.php +++ b/src/pocketmine/command/defaults/SayCommand.php @@ -26,7 +26,7 @@ namespace pocketmine\command\defaults; use pocketmine\command\CommandSender; use pocketmine\command\ConsoleCommandSender; use pocketmine\command\utils\InvalidCommandSyntaxException; -use pocketmine\event\TranslationContainer; +use pocketmine\lang\TranslationContainer; use pocketmine\Player; use pocketmine\utils\TextFormat; diff --git a/src/pocketmine/command/defaults/SeedCommand.php b/src/pocketmine/command/defaults/SeedCommand.php index f1bbec639..431c04d48 100644 --- a/src/pocketmine/command/defaults/SeedCommand.php +++ b/src/pocketmine/command/defaults/SeedCommand.php @@ -24,7 +24,7 @@ declare(strict_types=1); namespace pocketmine\command\defaults; use pocketmine\command\CommandSender; -use pocketmine\event\TranslationContainer; +use pocketmine\lang\TranslationContainer; use pocketmine\Player; class SeedCommand extends VanillaCommand{ diff --git a/src/pocketmine/command/defaults/SetWorldSpawnCommand.php b/src/pocketmine/command/defaults/SetWorldSpawnCommand.php index b1ac729af..b593956fe 100644 --- a/src/pocketmine/command/defaults/SetWorldSpawnCommand.php +++ b/src/pocketmine/command/defaults/SetWorldSpawnCommand.php @@ -26,7 +26,7 @@ namespace pocketmine\command\defaults; use pocketmine\command\Command; use pocketmine\command\CommandSender; use pocketmine\command\utils\InvalidCommandSyntaxException; -use pocketmine\event\TranslationContainer; +use pocketmine\lang\TranslationContainer; use pocketmine\math\Vector3; use pocketmine\Player; use pocketmine\utils\TextFormat; diff --git a/src/pocketmine/command/defaults/SpawnpointCommand.php b/src/pocketmine/command/defaults/SpawnpointCommand.php index 590f9b4cf..14c3c75e1 100644 --- a/src/pocketmine/command/defaults/SpawnpointCommand.php +++ b/src/pocketmine/command/defaults/SpawnpointCommand.php @@ -26,7 +26,7 @@ namespace pocketmine\command\defaults; use pocketmine\command\Command; use pocketmine\command\CommandSender; use pocketmine\command\utils\InvalidCommandSyntaxException; -use pocketmine\event\TranslationContainer; +use pocketmine\lang\TranslationContainer; use pocketmine\level\Level; use pocketmine\level\Position; use pocketmine\Player; diff --git a/src/pocketmine/command/defaults/StopCommand.php b/src/pocketmine/command/defaults/StopCommand.php index 55775b33d..cc5e2f1bf 100644 --- a/src/pocketmine/command/defaults/StopCommand.php +++ b/src/pocketmine/command/defaults/StopCommand.php @@ -25,7 +25,7 @@ namespace pocketmine\command\defaults; use pocketmine\command\Command; use pocketmine\command\CommandSender; -use pocketmine\event\TranslationContainer; +use pocketmine\lang\TranslationContainer; class StopCommand extends VanillaCommand{ diff --git a/src/pocketmine/command/defaults/TeleportCommand.php b/src/pocketmine/command/defaults/TeleportCommand.php index 62b6a52f8..f1876ab1d 100644 --- a/src/pocketmine/command/defaults/TeleportCommand.php +++ b/src/pocketmine/command/defaults/TeleportCommand.php @@ -26,7 +26,7 @@ namespace pocketmine\command\defaults; use pocketmine\command\Command; use pocketmine\command\CommandSender; use pocketmine\command\utils\InvalidCommandSyntaxException; -use pocketmine\event\TranslationContainer; +use pocketmine\lang\TranslationContainer; use pocketmine\math\Vector3; use pocketmine\Player; use pocketmine\utils\TextFormat; diff --git a/src/pocketmine/command/defaults/TellCommand.php b/src/pocketmine/command/defaults/TellCommand.php index 4dccfda90..714e7b11a 100644 --- a/src/pocketmine/command/defaults/TellCommand.php +++ b/src/pocketmine/command/defaults/TellCommand.php @@ -25,7 +25,7 @@ namespace pocketmine\command\defaults; use pocketmine\command\CommandSender; use pocketmine\command\utils\InvalidCommandSyntaxException; -use pocketmine\event\TranslationContainer; +use pocketmine\lang\TranslationContainer; use pocketmine\Player; use pocketmine\utils\TextFormat; diff --git a/src/pocketmine/command/defaults/TimeCommand.php b/src/pocketmine/command/defaults/TimeCommand.php index f64b6dedd..510963868 100644 --- a/src/pocketmine/command/defaults/TimeCommand.php +++ b/src/pocketmine/command/defaults/TimeCommand.php @@ -26,7 +26,7 @@ namespace pocketmine\command\defaults; use pocketmine\command\Command; use pocketmine\command\CommandSender; use pocketmine\command\utils\InvalidCommandSyntaxException; -use pocketmine\event\TranslationContainer; +use pocketmine\lang\TranslationContainer; use pocketmine\level\Level; use pocketmine\Player; use pocketmine\utils\TextFormat; diff --git a/src/pocketmine/command/defaults/TimingsCommand.php b/src/pocketmine/command/defaults/TimingsCommand.php index cfe1740b7..d19378c64 100644 --- a/src/pocketmine/command/defaults/TimingsCommand.php +++ b/src/pocketmine/command/defaults/TimingsCommand.php @@ -26,7 +26,7 @@ namespace pocketmine\command\defaults; use pocketmine\command\CommandSender; use pocketmine\command\utils\InvalidCommandSyntaxException; use pocketmine\event\TimingsHandler; -use pocketmine\event\TranslationContainer; +use pocketmine\lang\TranslationContainer; use pocketmine\Player; use pocketmine\scheduler\BulkCurlTask; use pocketmine\Server; diff --git a/src/pocketmine/command/defaults/TitleCommand.php b/src/pocketmine/command/defaults/TitleCommand.php index 0545cd9b3..485cd07ee 100644 --- a/src/pocketmine/command/defaults/TitleCommand.php +++ b/src/pocketmine/command/defaults/TitleCommand.php @@ -25,7 +25,7 @@ namespace pocketmine\command\defaults; use pocketmine\command\CommandSender; use pocketmine\command\utils\InvalidCommandSyntaxException; -use pocketmine\event\TranslationContainer; +use pocketmine\lang\TranslationContainer; class TitleCommand extends VanillaCommand{ diff --git a/src/pocketmine/command/defaults/VersionCommand.php b/src/pocketmine/command/defaults/VersionCommand.php index 54a89f3ec..84b9403e4 100644 --- a/src/pocketmine/command/defaults/VersionCommand.php +++ b/src/pocketmine/command/defaults/VersionCommand.php @@ -24,7 +24,7 @@ declare(strict_types=1); namespace pocketmine\command\defaults; use pocketmine\command\CommandSender; -use pocketmine\event\TranslationContainer; +use pocketmine\lang\TranslationContainer; use pocketmine\network\mcpe\protocol\ProtocolInfo; use pocketmine\plugin\Plugin; use pocketmine\utils\TextFormat; diff --git a/src/pocketmine/command/defaults/WhitelistCommand.php b/src/pocketmine/command/defaults/WhitelistCommand.php index d375b3eb9..98703e84c 100644 --- a/src/pocketmine/command/defaults/WhitelistCommand.php +++ b/src/pocketmine/command/defaults/WhitelistCommand.php @@ -26,7 +26,7 @@ namespace pocketmine\command\defaults; use pocketmine\command\Command; use pocketmine\command\CommandSender; use pocketmine\command\utils\InvalidCommandSyntaxException; -use pocketmine\event\TranslationContainer; +use pocketmine\lang\TranslationContainer; use pocketmine\utils\TextFormat; class WhitelistCommand extends VanillaCommand{ diff --git a/src/pocketmine/event/player/PlayerDeathEvent.php b/src/pocketmine/event/player/PlayerDeathEvent.php index e250d7355..0dbea790c 100644 --- a/src/pocketmine/event/player/PlayerDeathEvent.php +++ b/src/pocketmine/event/player/PlayerDeathEvent.php @@ -24,8 +24,8 @@ declare(strict_types=1); namespace pocketmine\event\player; use pocketmine\event\entity\EntityDeathEvent; -use pocketmine\event\TextContainer; use pocketmine\item\Item; +use pocketmine\lang\TextContainer; use pocketmine\Player; class PlayerDeathEvent extends EntityDeathEvent{ diff --git a/src/pocketmine/event/player/PlayerJoinEvent.php b/src/pocketmine/event/player/PlayerJoinEvent.php index d24955c0c..56e3e8b6a 100644 --- a/src/pocketmine/event/player/PlayerJoinEvent.php +++ b/src/pocketmine/event/player/PlayerJoinEvent.php @@ -23,7 +23,7 @@ declare(strict_types=1); namespace pocketmine\event\player; -use pocketmine\event\TextContainer; +use pocketmine\lang\TextContainer; use pocketmine\Player; /** diff --git a/src/pocketmine/event/player/PlayerKickEvent.php b/src/pocketmine/event/player/PlayerKickEvent.php index a0573005e..48a6e6b5f 100644 --- a/src/pocketmine/event/player/PlayerKickEvent.php +++ b/src/pocketmine/event/player/PlayerKickEvent.php @@ -24,7 +24,7 @@ declare(strict_types=1); namespace pocketmine\event\player; use pocketmine\event\Cancellable; -use pocketmine\event\TextContainer; +use pocketmine\lang\TextContainer; use pocketmine\Player; /** diff --git a/src/pocketmine/event/player/PlayerQuitEvent.php b/src/pocketmine/event/player/PlayerQuitEvent.php index 5167ac640..3245c5a85 100644 --- a/src/pocketmine/event/player/PlayerQuitEvent.php +++ b/src/pocketmine/event/player/PlayerQuitEvent.php @@ -23,7 +23,7 @@ declare(strict_types=1); namespace pocketmine\event\player; -use pocketmine\event\TranslationContainer; +use pocketmine\lang\TranslationContainer; use pocketmine\Player; /** diff --git a/src/pocketmine/lang/BaseLang.php b/src/pocketmine/lang/BaseLang.php index 18a517f57..e573a0f73 100644 --- a/src/pocketmine/lang/BaseLang.php +++ b/src/pocketmine/lang/BaseLang.php @@ -23,8 +23,6 @@ declare(strict_types=1); namespace pocketmine\lang; -use pocketmine\event\TextContainer; -use pocketmine\event\TranslationContainer; use pocketmine\utils\MainLogger; class BaseLang{ diff --git a/src/pocketmine/event/TextContainer.php b/src/pocketmine/lang/TextContainer.php similarity index 97% rename from src/pocketmine/event/TextContainer.php rename to src/pocketmine/lang/TextContainer.php index 21e1a551d..99504d0ae 100644 --- a/src/pocketmine/event/TextContainer.php +++ b/src/pocketmine/lang/TextContainer.php @@ -21,7 +21,7 @@ declare(strict_types=1); -namespace pocketmine\event; +namespace pocketmine\lang; class TextContainer{ diff --git a/src/pocketmine/event/TranslationContainer.php b/src/pocketmine/lang/TranslationContainer.php similarity index 98% rename from src/pocketmine/event/TranslationContainer.php rename to src/pocketmine/lang/TranslationContainer.php index 7dc4beadf..acb2f267e 100644 --- a/src/pocketmine/event/TranslationContainer.php +++ b/src/pocketmine/lang/TranslationContainer.php @@ -21,7 +21,7 @@ declare(strict_types=1); -namespace pocketmine\event; +namespace pocketmine\lang; class TranslationContainer extends TextContainer{