diff --git a/plugin.yml b/plugin.yml index 9cefbe6..378bbd5 100755 --- a/plugin.yml +++ b/plugin.yml @@ -17,9 +17,9 @@ author: BlockHorizons authors: - Chris-Prime (@PrimusLV, @flipkris) - Sandertv (@Sandertv) -api: [3.0.0] -main: "fpe\\FactionsPE" -version: 1.4.0 +api: 3.17.2 +main: "BlockHorizons\\FactionsPE\\FactionsPE" +version: 1.4.1 softdepend: [EconomyAPI, MassiveEconomy, PocketMoney, GoldStd, ScoreboardAPI] permissions: diff --git a/src/fpe/FactionsPE.php b/src/BlockHorizons/FactionsPE/FactionsPE.php similarity index 88% rename from src/fpe/FactionsPE.php rename to src/BlockHorizons/FactionsPE/FactionsPE.php index 8fea224..5bca5ca 100755 --- a/src/fpe/FactionsPE.php +++ b/src/BlockHorizons/FactionsPE/FactionsPE.php @@ -4,37 +4,37 @@ * Copyright (C) 2020 BlockHorizons */ -namespace fpe; - -use fpe\economizer\Economizer; -use fpe\economizer\Transistor; -use fpe\dominate\Command; -use fpe\command\FactionCommand; -use fpe\data\provider\DataProvider; -use fpe\data\provider\JSONDataProvider; -use fpe\data\provider\MySQLDataProvider; -use fpe\data\provider\SQLite3DataProvider; -use fpe\data\provider\YAMLDataProvider; -use fpe\engine\BoardEngine; -use fpe\engine\ChatEngine; -use fpe\engine\CombatEngine; -use fpe\engine\Engine; -use fpe\engine\ExploitEngine; -use fpe\engine\MainEngine; -use fpe\engine\SeeChunkEngine; -use fpe\entity\Faction; -use fpe\entity\FConsole; -use fpe\form\FactionForm; -use fpe\manager\Factions; -use fpe\manager\Flags; -use fpe\manager\Members; -use fpe\manager\Permissions; -use fpe\manager\Plots; -use fpe\task\HUD; -use fpe\task\PowerUpdateTask; -use fpe\utils\Gameplay; -use fpe\utils\Text; -use fpe\localizer\Localizer; +namespace BlockHorizons\FactionsPE; + +use BlockHorizons\FactionsPE\economizer\Economizer; +use BlockHorizons\FactionsPE\economizer\Transistor; +use BlockHorizons\FactionsPE\dominate\Command; +use BlockHorizons\FactionsPE\command\FactionCommand; +use BlockHorizons\FactionsPE\data\provider\DataProvider; +use BlockHorizons\FactionsPE\data\provider\JSONDataProvider; +use BlockHorizons\FactionsPE\data\provider\MySQLDataProvider; +use BlockHorizons\FactionsPE\data\provider\SQLite3DataProvider; +use BlockHorizons\FactionsPE\data\provider\YAMLDataProvider; +use BlockHorizons\FactionsPE\engine\BoardEngine; +use BlockHorizons\FactionsPE\engine\ChatEngine; +use BlockHorizons\FactionsPE\engine\CombatEngine; +use BlockHorizons\FactionsPE\engine\Engine; +use BlockHorizons\FactionsPE\engine\ExploitEngine; +use BlockHorizons\FactionsPE\engine\MainEngine; +use BlockHorizons\FactionsPE\engine\SeeChunkEngine; +use BlockHorizons\FactionsPE\entity\Faction; +use BlockHorizons\FactionsPE\entity\FConsole; +use BlockHorizons\FactionsPE\form\FactionForm; +use BlockHorizons\FactionsPE\manager\Factions; +use BlockHorizons\FactionsPE\manager\Flags; +use BlockHorizons\FactionsPE\manager\Members; +use BlockHorizons\FactionsPE\manager\Permissions; +use BlockHorizons\FactionsPE\manager\Plots; +use BlockHorizons\FactionsPE\task\HUD; +use BlockHorizons\FactionsPE\task\PowerUpdateTask; +use BlockHorizons\FactionsPE\utils\Gameplay; +use BlockHorizons\FactionsPE\utils\Text; +use BlockHorizons\FactionsPE\localizer\Localizer; use jasonwynn10\ScoreboardAPI\ScoreboardAPI; use pocketmine\plugin\PluginBase; diff --git a/src/fpe/command/Balance.php b/src/BlockHorizons/FactionsPE/command/Balance.php similarity index 75% rename from src/fpe/command/Balance.php rename to src/BlockHorizons/FactionsPE/command/Balance.php index 051008b..ce38dd8 100755 --- a/src/fpe/command/Balance.php +++ b/src/BlockHorizons/FactionsPE/command/Balance.php @@ -4,11 +4,11 @@ * Copyright (C) 2020 BlockHorizons */ -namespace fpe\command; +namespace BlockHorizons\FactionsPE\command; -use fpe\command\parameter\FactionParameter; -use fpe\dominate\Command; -use fpe\manager\Permissions; +use BlockHorizons\FactionsPE\command\parameter\FactionParameter; +use BlockHorizons\FactionsPE\dominate\Command; +use BlockHorizons\FactionsPE\manager\Permissions; use pocketmine\command\CommandSender; class Balance extends Command diff --git a/src/fpe/command/Chat.php b/src/BlockHorizons/FactionsPE/command/Chat.php similarity index 78% rename from src/fpe/command/Chat.php rename to src/BlockHorizons/FactionsPE/command/Chat.php index f8cb105..a7acf9b 100755 --- a/src/fpe/command/Chat.php +++ b/src/BlockHorizons/FactionsPE/command/Chat.php @@ -4,11 +4,11 @@ * Copyright (C) 2020 BlockHorizons */ -namespace fpe\command; +namespace BlockHorizons\FactionsPE\command; -use fpe\dominate\Command; -use fpe\localizer\Localizer; -use fpe\manager\Members; +use BlockHorizons\FactionsPE\dominate\Command; +use BlockHorizons\FactionsPE\localizer\Localizer; +use BlockHorizons\FactionsPE\manager\Members; use pocketmine\command\CommandSender; class Chat extends Command diff --git a/src/fpe/command/Claim.php b/src/BlockHorizons/FactionsPE/command/Claim.php similarity index 74% rename from src/fpe/command/Claim.php rename to src/BlockHorizons/FactionsPE/command/Claim.php index a05c126..ce853cb 100755 --- a/src/fpe/command/Claim.php +++ b/src/BlockHorizons/FactionsPE/command/Claim.php @@ -4,13 +4,13 @@ * Copyright (C) 2020 BlockHorizons */ -namespace fpe\command; +namespace BlockHorizons\FactionsPE\command; -use fpe\command\requirement\FactionRequirement; -use fpe\dominate\Command; -use fpe\dominate\parameter\Parameter; -use fpe\dominate\requirement\SimpleRequirement; -use fpe\manager\Permissions; +use BlockHorizons\FactionsPE\command\requirement\FactionRequirement; +use BlockHorizons\FactionsPE\dominate\Command; +use BlockHorizons\FactionsPE\dominate\parameter\Parameter; +use BlockHorizons\FactionsPE\dominate\requirement\SimpleRequirement; +use BlockHorizons\FactionsPE\manager\Permissions; class Claim extends Command { diff --git a/src/fpe/command/ClaimAll.php b/src/BlockHorizons/FactionsPE/command/ClaimAll.php similarity index 83% rename from src/fpe/command/ClaimAll.php rename to src/BlockHorizons/FactionsPE/command/ClaimAll.php index baa6cf2..1a0ca44 100755 --- a/src/fpe/command/ClaimAll.php +++ b/src/BlockHorizons/FactionsPE/command/ClaimAll.php @@ -4,9 +4,9 @@ * Copyright (C) 2020 BlockHorizons */ -namespace fpe\command; +namespace BlockHorizons\FactionsPE\command; -use fpe\manager\Plots; +use BlockHorizons\FactionsPE\manager\Plots; use pocketmine\command\CommandSender; use pocketmine\level\Position; diff --git a/src/fpe/command/ClaimAuto.php b/src/BlockHorizons/FactionsPE/command/ClaimAuto.php similarity index 73% rename from src/fpe/command/ClaimAuto.php rename to src/BlockHorizons/FactionsPE/command/ClaimAuto.php index a4f57fe..50f9047 100755 --- a/src/fpe/command/ClaimAuto.php +++ b/src/BlockHorizons/FactionsPE/command/ClaimAuto.php @@ -4,15 +4,15 @@ * Copyright (C) 2020 BlockHorizons */ -namespace fpe\command; - -use fpe\command\requirement\FactionPermission; -use fpe\command\requirement\FactionRequirement; -use fpe\localizer\Localizer; -use fpe\manager\Members; -use fpe\manager\Permissions; -use fpe\permission\Permission; -use fpe\utils\Text; +namespace BlockHorizons\FactionsPE\command; + +use BlockHorizons\FactionsPE\command\requirement\FactionPermission; +use BlockHorizons\FactionsPE\command\requirement\FactionRequirement; +use BlockHorizons\FactionsPE\localizer\Localizer; +use BlockHorizons\FactionsPE\manager\Members; +use BlockHorizons\FactionsPE\manager\Permissions; +use BlockHorizons\FactionsPE\permission\Permission; +use BlockHorizons\FactionsPE\utils\Text; use pocketmine\command\CommandSender; class ClaimAuto extends ClaimOne diff --git a/src/fpe/command/ClaimOne.php b/src/BlockHorizons/FactionsPE/command/ClaimOne.php similarity index 74% rename from src/fpe/command/ClaimOne.php rename to src/BlockHorizons/FactionsPE/command/ClaimOne.php index 30ea92b..82a7e47 100755 --- a/src/fpe/command/ClaimOne.php +++ b/src/BlockHorizons/FactionsPE/command/ClaimOne.php @@ -4,9 +4,9 @@ * Copyright (C) 2020 BlockHorizons */ -namespace fpe\command; +namespace BlockHorizons\FactionsPE\command; -use fpe\entity\Plot; +use BlockHorizons\FactionsPE\entity\Plot; use pocketmine\level\Position; class ClaimOne extends ClaimX diff --git a/src/fpe/command/ClaimSquare.php b/src/BlockHorizons/FactionsPE/command/ClaimSquare.php similarity index 90% rename from src/fpe/command/ClaimSquare.php rename to src/BlockHorizons/FactionsPE/command/ClaimSquare.php index 8af643a..7e8341f 100755 --- a/src/fpe/command/ClaimSquare.php +++ b/src/BlockHorizons/FactionsPE/command/ClaimSquare.php @@ -4,9 +4,9 @@ * Copyright (C) 2020 BlockHorizons */ -namespace fpe\command; +namespace BlockHorizons\FactionsPE\command; -use fpe\entity\Plot; +use BlockHorizons\FactionsPE\entity\Plot; use pocketmine\level\Position; class ClaimSquare extends ClaimXRadius diff --git a/src/fpe/command/ClaimX.php b/src/BlockHorizons/FactionsPE/command/ClaimX.php similarity index 84% rename from src/fpe/command/ClaimX.php rename to src/BlockHorizons/FactionsPE/command/ClaimX.php index 806ddea..894aaa8 100755 --- a/src/fpe/command/ClaimX.php +++ b/src/BlockHorizons/FactionsPE/command/ClaimX.php @@ -4,12 +4,12 @@ * Copyright (C) 2020 BlockHorizons */ -namespace fpe\command; +namespace BlockHorizons\FactionsPE\command; -use fpe\command\parameter\FactionParameter; -use fpe\dominate\Command; -use fpe\manager\Members; -use fpe\manager\Plots; +use BlockHorizons\FactionsPE\command\parameter\FactionParameter; +use BlockHorizons\FactionsPE\dominate\Command; +use BlockHorizons\FactionsPE\manager\Members; +use BlockHorizons\FactionsPE\manager\Plots; use pocketmine\command\CommandSender; use pocketmine\level\Position; use pocketmine\Player; @@ -75,7 +75,7 @@ public function setFactionArgIndex(int $factionArgIndex) /** * @param Position $pos - * @return \fpe\entity\Plot[] + * @return \BlockHorizons\FactionsPE\entity\Plot[] */ public abstract function getPlots(Position $pos): array; diff --git a/src/fpe/command/ClaimXRadius.php b/src/BlockHorizons/FactionsPE/command/ClaimXRadius.php similarity index 83% rename from src/fpe/command/ClaimXRadius.php rename to src/BlockHorizons/FactionsPE/command/ClaimXRadius.php index f536bc5..caac95d 100755 --- a/src/fpe/command/ClaimXRadius.php +++ b/src/BlockHorizons/FactionsPE/command/ClaimXRadius.php @@ -4,12 +4,12 @@ * Copyright (C) 2020 BlockHorizons */ -namespace fpe\command; +namespace BlockHorizons\FactionsPE\command; -use fpe\dominate\parameter\Parameter; -use fpe\manager\Members; -use fpe\utils\Gameplay; -use fpe\localizer\Localizer; +use BlockHorizons\FactionsPE\dominate\parameter\Parameter; +use BlockHorizons\FactionsPE\manager\Members; +use BlockHorizons\FactionsPE\utils\Gameplay; +use BlockHorizons\FactionsPE\localizer\Localizer; abstract class ClaimXRadius extends ClaimX { diff --git a/src/fpe/command/Close.php b/src/BlockHorizons/FactionsPE/command/Close.php similarity index 67% rename from src/fpe/command/Close.php rename to src/BlockHorizons/FactionsPE/command/Close.php index e62bdaa..0ae6a12 100755 --- a/src/fpe/command/Close.php +++ b/src/BlockHorizons/FactionsPE/command/Close.php @@ -4,15 +4,15 @@ * Copyright (C) 2020 BlockHorizons */ -namespace fpe\command; +namespace BlockHorizons\FactionsPE\command; -use fpe\command\requirement\FactionRequirement; -use fpe\command\requirement\FactionRole; -use fpe\dominate\Command; -use fpe\flag\Flag; -use fpe\localizer\Localizer; -use fpe\manager\Members; -use fpe\relation\Relation; +use BlockHorizons\FactionsPE\command\requirement\FactionRequirement; +use BlockHorizons\FactionsPE\command\requirement\FactionRole; +use BlockHorizons\FactionsPE\dominate\Command; +use BlockHorizons\FactionsPE\flag\Flag; +use BlockHorizons\FactionsPE\localizer\Localizer; +use BlockHorizons\FactionsPE\manager\Members; +use BlockHorizons\FactionsPE\relation\Relation; use pocketmine\command\CommandSender; class Close extends Command diff --git a/src/fpe/command/CreateFaction.php b/src/BlockHorizons/FactionsPE/command/CreateFaction.php similarity index 81% rename from src/fpe/command/CreateFaction.php rename to src/BlockHorizons/FactionsPE/command/CreateFaction.php index 920444f..0830685 100755 --- a/src/fpe/command/CreateFaction.php +++ b/src/BlockHorizons/FactionsPE/command/CreateFaction.php @@ -4,21 +4,21 @@ * Copyright (C) 2020 BlockHorizons */ -namespace fpe\command; - -use fpe\data\FactionData; -use fpe\dominate\Command; -use fpe\dominate\parameter\Parameter; -use fpe\dominate\requirement\SimpleRequirement; -use fpe\command\requirement\FactionRequirement; -use fpe\entity\Faction; -use fpe\event\faction\FactionCreateEvent; -use fpe\event\member\MembershipChangeEvent; -use fpe\FactionsPE; -use fpe\manager\Factions; -use fpe\manager\Members; -use fpe\utils\Gameplay; -use fpe\localizer\Localizer; +namespace BlockHorizons\FactionsPE\command; + +use BlockHorizons\FactionsPE\data\FactionData; +use BlockHorizons\FactionsPE\dominate\Command; +use BlockHorizons\FactionsPE\dominate\parameter\Parameter; +use BlockHorizons\FactionsPE\dominate\requirement\SimpleRequirement; +use BlockHorizons\FactionsPE\command\requirement\FactionRequirement; +use BlockHorizons\FactionsPE\entity\Faction; +use BlockHorizons\FactionsPE\event\faction\FactionCreateEvent; +use BlockHorizons\FactionsPE\event\member\MembershipChangeEvent; +use BlockHorizons\FactionsPE\FactionsPE; +use BlockHorizons\FactionsPE\manager\Factions; +use BlockHorizons\FactionsPE\manager\Members; +use BlockHorizons\FactionsPE\utils\Gameplay; +use BlockHorizons\FactionsPE\localizer\Localizer; use pocketmine\command\CommandSender; use pocketmine\Player; diff --git a/src/fpe/command/Deposit.php b/src/BlockHorizons/FactionsPE/command/Deposit.php similarity index 71% rename from src/fpe/command/Deposit.php rename to src/BlockHorizons/FactionsPE/command/Deposit.php index b38a905..b8512ed 100755 --- a/src/fpe/command/Deposit.php +++ b/src/BlockHorizons/FactionsPE/command/Deposit.php @@ -4,19 +4,19 @@ * Copyright (C) 2020 BlockHorizons */ -namespace fpe\command; - -use fpe\command\requirement\FactionPermission; -use fpe\command\requirement\FactionRequirement; -use fpe\dominate\Command; -use fpe\dominate\parameter\Parameter; -use fpe\dominate\requirement\SimpleRequirement; -use fpe\FactionsPE; -use fpe\localizer\Localizer; -use fpe\manager\Members; -use fpe\manager\Permissions; -use fpe\permission\Permission; -use fpe\utils\Gameplay; +namespace BlockHorizons\FactionsPE\command; + +use BlockHorizons\FactionsPE\command\requirement\FactionPermission; +use BlockHorizons\FactionsPE\command\requirement\FactionRequirement; +use BlockHorizons\FactionsPE\dominate\Command; +use BlockHorizons\FactionsPE\dominate\parameter\Parameter; +use BlockHorizons\FactionsPE\dominate\requirement\SimpleRequirement; +use BlockHorizons\FactionsPE\FactionsPE; +use BlockHorizons\FactionsPE\localizer\Localizer; +use BlockHorizons\FactionsPE\manager\Members; +use BlockHorizons\FactionsPE\manager\Permissions; +use BlockHorizons\FactionsPE\permission\Permission; +use BlockHorizons\FactionsPE\utils\Gameplay; use pocketmine\command\CommandSender; class Deposit extends Command diff --git a/src/fpe/command/Description.php b/src/BlockHorizons/FactionsPE/command/Description.php similarity index 87% rename from src/fpe/command/Description.php rename to src/BlockHorizons/FactionsPE/command/Description.php index 05aa2a8..e8e9ace 100644 --- a/src/fpe/command/Description.php +++ b/src/BlockHorizons/FactionsPE/command/Description.php @@ -4,12 +4,12 @@ * Copyright (C) 2020 BlockHorizons */ -namespace fpe\command; +namespace BlockHorizons\FactionsPE\command; -use fpe\dominate\Command; -use fpe\dominate\parameter\Parameter; -use fpe\localizer\Localizer; -use fpe\manager\Members; +use BlockHorizons\FactionsPE\dominate\Command; +use BlockHorizons\FactionsPE\dominate\parameter\Parameter; +use BlockHorizons\FactionsPE\localizer\Localizer; +use BlockHorizons\FactionsPE\manager\Members; use pocketmine\command\CommandSender; use pocketmine\Player; diff --git a/src/fpe/command/Disband.php b/src/BlockHorizons/FactionsPE/command/Disband.php similarity index 82% rename from src/fpe/command/Disband.php rename to src/BlockHorizons/FactionsPE/command/Disband.php index c728dbb..f6f8eff 100755 --- a/src/fpe/command/Disband.php +++ b/src/BlockHorizons/FactionsPE/command/Disband.php @@ -4,19 +4,19 @@ * Copyright (C) 2020 BlockHorizons */ -namespace fpe\command; - -use fpe\command\parameter\FactionParameter; -use fpe\dominate\Command; -use fpe\entity\Faction; -use fpe\event\faction\FactionDisbandEvent; -use fpe\FactionsPE; -use fpe\flag\Flag; -use fpe\localizer\Localizer; -use fpe\manager\Members; -use fpe\manager\Permissions; -use fpe\permission\Permission; -use fpe\utils\Gameplay; +namespace BlockHorizons\FactionsPE\command; + +use BlockHorizons\FactionsPE\command\parameter\FactionParameter; +use BlockHorizons\FactionsPE\dominate\Command; +use BlockHorizons\FactionsPE\entity\Faction; +use BlockHorizons\FactionsPE\event\faction\FactionDisbandEvent; +use BlockHorizons\FactionsPE\FactionsPE; +use BlockHorizons\FactionsPE\flag\Flag; +use BlockHorizons\FactionsPE\localizer\Localizer; +use BlockHorizons\FactionsPE\manager\Members; +use BlockHorizons\FactionsPE\manager\Permissions; +use BlockHorizons\FactionsPE\permission\Permission; +use BlockHorizons\FactionsPE\utils\Gameplay; use pocketmine\command\CommandSender; use pocketmine\Player; diff --git a/src/fpe/command/FactionCommand.php b/src/BlockHorizons/FactionsPE/command/FactionCommand.php similarity index 90% rename from src/fpe/command/FactionCommand.php rename to src/BlockHorizons/FactionsPE/command/FactionCommand.php index 73c9b87..8fd3b0d 100755 --- a/src/fpe/command/FactionCommand.php +++ b/src/BlockHorizons/FactionsPE/command/FactionCommand.php @@ -5,18 +5,18 @@ * Copyright (C) 2020 BlockHorizons */ -namespace fpe\command; +namespace BlockHorizons\FactionsPE\command; -use fpe\dominate\Command; -use fpe\dominate\parameter\Parameter; -use fpe\command\Player as PlayerCommand; -use fpe\FactionsPE; -use fpe\form\FactionForm; -use fpe\manager\Members; -use fpe\manager\Permissions; -use fpe\relation\Relation as Rel; -use fpe\utils\Gameplay; -use fpe\localizer\Localizer; +use BlockHorizons\FactionsPE\dominate\Command; +use BlockHorizons\FactionsPE\dominate\parameter\Parameter; +use BlockHorizons\FactionsPE\command\Player as PlayerCommand; +use BlockHorizons\FactionsPE\FactionsPE; +use BlockHorizons\FactionsPE\form\FactionForm; +use BlockHorizons\FactionsPE\manager\Members; +use BlockHorizons\FactionsPE\manager\Permissions; +use BlockHorizons\FactionsPE\relation\Relation as Rel; +use BlockHorizons\FactionsPE\utils\Gameplay; +use BlockHorizons\FactionsPE\localizer\Localizer; use pocketmine\command\CommandSender; use pocketmine\Player; diff --git a/src/fpe/command/FlagCommand.php b/src/BlockHorizons/FactionsPE/command/FlagCommand.php similarity index 71% rename from src/fpe/command/FlagCommand.php rename to src/BlockHorizons/FactionsPE/command/FlagCommand.php index 3eb9ab4..62683ba 100644 --- a/src/fpe/command/FlagCommand.php +++ b/src/BlockHorizons/FactionsPE/command/FlagCommand.php @@ -1,10 +1,10 @@ . */ -namespace fpe\command; +namespace BlockHorizons\FactionsPE\command; -use fpe\command\requirement\FactionRequirement; -use fpe\dominate\Command; -use fpe\dominate\requirement\SimpleRequirement; -use fpe\manager\Members; -use fpe\manager\Permissions; -use fpe\manager\Plots; -use fpe\permission\Permission; +use BlockHorizons\FactionsPE\command\requirement\FactionRequirement; +use BlockHorizons\FactionsPE\dominate\Command; +use BlockHorizons\FactionsPE\dominate\requirement\SimpleRequirement; +use BlockHorizons\FactionsPE\manager\Members; +use BlockHorizons\FactionsPE\manager\Permissions; +use BlockHorizons\FactionsPE\manager\Plots; +use BlockHorizons\FactionsPE\permission\Permission; use pocketmine\command\CommandSender; class Fly extends Command diff --git a/src/fpe/command/Help.php b/src/BlockHorizons/FactionsPE/command/Help.php similarity index 90% rename from src/fpe/command/Help.php rename to src/BlockHorizons/FactionsPE/command/Help.php index 0dd28d2..b0f5227 100755 --- a/src/fpe/command/Help.php +++ b/src/BlockHorizons/FactionsPE/command/Help.php @@ -4,12 +4,12 @@ * Copyright (C) 2020 BlockHorizons */ -namespace fpe\command; +namespace BlockHorizons\FactionsPE\command; -use fpe\dominate\Command; -use fpe\dominate\parameter\Parameter; -use fpe\localizer\Localizer; -use fpe\utils\Pager; +use BlockHorizons\FactionsPE\dominate\Command; +use BlockHorizons\FactionsPE\dominate\parameter\Parameter; +use BlockHorizons\FactionsPE\localizer\Localizer; +use BlockHorizons\FactionsPE\utils\Pager; use pocketmine\command\CommandSender; use pocketmine\Player; use pocketmine\utils\TextFormat; diff --git a/src/fpe/command/Home.php b/src/BlockHorizons/FactionsPE/command/Home.php similarity index 80% rename from src/fpe/command/Home.php rename to src/BlockHorizons/FactionsPE/command/Home.php index d2ab6dc..ca15b32 100755 --- a/src/fpe/command/Home.php +++ b/src/BlockHorizons/FactionsPE/command/Home.php @@ -4,23 +4,23 @@ * Copyright (C) 2020 BlockHorizons */ -namespace fpe\command; +namespace BlockHorizons\FactionsPE\command; -use fpe\command\requirement\FactionPermission; -use fpe\command\requirement\FactionRequirement; -use fpe\dominate\Command; -use fpe\dominate\requirement\SimpleRequirement; -use fpe\event\member\MemberHomeTeleportEvent; -use fpe\FactionsPE; -use fpe\flag\Flag; -use fpe\localizer\Localizer; -use fpe\manager\Members; -use fpe\manager\Permissions; -use fpe\manager\Plots; -use fpe\permission\Permission; -use fpe\relation\Relation; -use fpe\relation\RelationParticipator; -use fpe\utils\Gameplay; +use BlockHorizons\FactionsPE\command\requirement\FactionPermission; +use BlockHorizons\FactionsPE\command\requirement\FactionRequirement; +use BlockHorizons\FactionsPE\dominate\Command; +use BlockHorizons\FactionsPE\dominate\requirement\SimpleRequirement; +use BlockHorizons\FactionsPE\event\member\MemberHomeTeleportEvent; +use BlockHorizons\FactionsPE\FactionsPE; +use BlockHorizons\FactionsPE\flag\Flag; +use BlockHorizons\FactionsPE\localizer\Localizer; +use BlockHorizons\FactionsPE\manager\Members; +use BlockHorizons\FactionsPE\manager\Permissions; +use BlockHorizons\FactionsPE\manager\Plots; +use BlockHorizons\FactionsPE\permission\Permission; +use BlockHorizons\FactionsPE\relation\Relation; +use BlockHorizons\FactionsPE\relation\RelationParticipator; +use BlockHorizons\FactionsPE\utils\Gameplay; use pocketmine\command\CommandSender; use pocketmine\Player; diff --git a/src/fpe/command/HudSwitch.php b/src/BlockHorizons/FactionsPE/command/HudSwitch.php similarity index 67% rename from src/fpe/command/HudSwitch.php rename to src/BlockHorizons/FactionsPE/command/HudSwitch.php index ef960a5..c2873c7 100755 --- a/src/fpe/command/HudSwitch.php +++ b/src/BlockHorizons/FactionsPE/command/HudSwitch.php @@ -1,11 +1,11 @@ getArgument(0); $faction = $this->getArgument(1); diff --git a/src/fpe/command/Open.php b/src/BlockHorizons/FactionsPE/command/Open.php similarity index 67% rename from src/fpe/command/Open.php rename to src/BlockHorizons/FactionsPE/command/Open.php index 0bbaa62..a617a26 100755 --- a/src/fpe/command/Open.php +++ b/src/BlockHorizons/FactionsPE/command/Open.php @@ -4,15 +4,15 @@ * Copyright (C) 2020 BlockHorizons */ -namespace fpe\command; +namespace BlockHorizons\FactionsPE\command; -use fpe\command\requirement\FactionRequirement; -use fpe\command\requirement\FactionRole; -use fpe\dominate\Command; -use fpe\flag\Flag; -use fpe\localizer\Localizer; -use fpe\manager\Members; -use fpe\relation\Relation; +use BlockHorizons\FactionsPE\command\requirement\FactionRequirement; +use BlockHorizons\FactionsPE\command\requirement\FactionRole; +use BlockHorizons\FactionsPE\dominate\Command; +use BlockHorizons\FactionsPE\flag\Flag; +use BlockHorizons\FactionsPE\localizer\Localizer; +use BlockHorizons\FactionsPE\manager\Members; +use BlockHorizons\FactionsPE\relation\Relation; use pocketmine\command\CommandSender; class Open extends Command diff --git a/src/fpe/command/Override.php b/src/BlockHorizons/FactionsPE/command/Override.php similarity index 71% rename from src/fpe/command/Override.php rename to src/BlockHorizons/FactionsPE/command/Override.php index 7e0aa9c..2e497dc 100755 --- a/src/fpe/command/Override.php +++ b/src/BlockHorizons/FactionsPE/command/Override.php @@ -4,15 +4,15 @@ * Copyright (C) 2020 BlockHorizons */ -namespace fpe\command; - -use fpe\dominate\Command; -use fpe\dominate\parameter\Parameter; -use fpe\FactionsPE; -use fpe\localizer\Localizer; -use fpe\manager\Members; -use fpe\utils\Gameplay; -use fpe\utils\Text; +namespace BlockHorizons\FactionsPE\command; + +use BlockHorizons\FactionsPE\dominate\Command; +use BlockHorizons\FactionsPE\dominate\parameter\Parameter; +use BlockHorizons\FactionsPE\FactionsPE; +use BlockHorizons\FactionsPE\localizer\Localizer; +use BlockHorizons\FactionsPE\manager\Members; +use BlockHorizons\FactionsPE\utils\Gameplay; +use BlockHorizons\FactionsPE\utils\Text; use pocketmine\command\CommandSender; class Override extends Command diff --git a/src/fpe/command/Perm.php b/src/BlockHorizons/FactionsPE/command/Perm.php similarity index 61% rename from src/fpe/command/Perm.php rename to src/BlockHorizons/FactionsPE/command/Perm.php index 829ceeb..5707903 100755 --- a/src/fpe/command/Perm.php +++ b/src/BlockHorizons/FactionsPE/command/Perm.php @@ -4,14 +4,14 @@ * Copyright (C) 2020 BlockHorizons */ -namespace fpe\command; +namespace BlockHorizons\FactionsPE\command; -use fpe\command\subcommand\childs\PermListChild; -use fpe\command\subcommand\childs\PermSetChild; -use fpe\command\subcommand\childs\PermShowChild; -use fpe\dominate\Command; -use fpe\dominate\parameter\Parameter; -use fpe\manager\Permissions; +use BlockHorizons\FactionsPE\command\subcommand\childs\PermListChild; +use BlockHorizons\FactionsPE\command\subcommand\childs\PermSetChild; +use BlockHorizons\FactionsPE\command\subcommand\childs\PermShowChild; +use BlockHorizons\FactionsPE\dominate\Command; +use BlockHorizons\FactionsPE\dominate\parameter\Parameter; +use BlockHorizons\FactionsPE\manager\Permissions; class Perm extends Command { diff --git a/src/fpe/command/PermList.php b/src/BlockHorizons/FactionsPE/command/PermList.php similarity index 75% rename from src/fpe/command/PermList.php rename to src/BlockHorizons/FactionsPE/command/PermList.php index 82a731f..1c3be94 100755 --- a/src/fpe/command/PermList.php +++ b/src/BlockHorizons/FactionsPE/command/PermList.php @@ -4,15 +4,15 @@ * Copyright (C) 2020 BlockHorizons */ -namespace fpe\command; - -use fpe\dominate\Command; -use fpe\dominate\parameter\Parameter; -use fpe\localizer\Localizer; -use fpe\manager\Members; -use fpe\manager\Permissions; -use fpe\permission\Permission; -use fpe\utils\Pager; +namespace BlockHorizons\FactionsPE\command; + +use BlockHorizons\FactionsPE\dominate\Command; +use BlockHorizons\FactionsPE\dominate\parameter\Parameter; +use BlockHorizons\FactionsPE\localizer\Localizer; +use BlockHorizons\FactionsPE\manager\Members; +use BlockHorizons\FactionsPE\manager\Permissions; +use BlockHorizons\FactionsPE\permission\Permission; +use BlockHorizons\FactionsPE\utils\Pager; use pocketmine\command\CommandSender; class PermList extends Command diff --git a/src/fpe/command/PermSet.php b/src/BlockHorizons/FactionsPE/command/PermSet.php similarity index 79% rename from src/fpe/command/PermSet.php rename to src/BlockHorizons/FactionsPE/command/PermSet.php index f96beac..421416f 100755 --- a/src/fpe/command/PermSet.php +++ b/src/BlockHorizons/FactionsPE/command/PermSet.php @@ -4,23 +4,23 @@ * Copyright (C) 2020 BlockHorizons */ -namespace fpe\command; - -use fpe\command\parameter\FactionParameter; -use fpe\command\parameter\PermissionParameter; -use fpe\command\parameter\RelationParameter; -use fpe\dominate\Command; -use fpe\dominate\parameter\Parameter; -use fpe\entity\Faction; -use fpe\event\faction\FactionPermissionChangeEvent; -use fpe\FactionsPE; -use fpe\localizer\Localizer; -use fpe\manager\Members; -use fpe\manager\Permissions; -use fpe\permission\Permission; -use fpe\relation\Relation; -use fpe\utils\Gameplay; -use fpe\utils\Text; +namespace BlockHorizons\FactionsPE\command; + +use BlockHorizons\FactionsPE\command\parameter\FactionParameter; +use BlockHorizons\FactionsPE\command\parameter\PermissionParameter; +use BlockHorizons\FactionsPE\command\parameter\RelationParameter; +use BlockHorizons\FactionsPE\dominate\Command; +use BlockHorizons\FactionsPE\dominate\parameter\Parameter; +use BlockHorizons\FactionsPE\entity\Faction; +use BlockHorizons\FactionsPE\event\faction\FactionPermissionChangeEvent; +use BlockHorizons\FactionsPE\FactionsPE; +use BlockHorizons\FactionsPE\localizer\Localizer; +use BlockHorizons\FactionsPE\manager\Members; +use BlockHorizons\FactionsPE\manager\Permissions; +use BlockHorizons\FactionsPE\permission\Permission; +use BlockHorizons\FactionsPE\relation\Relation; +use BlockHorizons\FactionsPE\utils\Gameplay; +use BlockHorizons\FactionsPE\utils\Text; use pocketmine\command\CommandSender; class PermSet extends Command diff --git a/src/fpe/command/PermShow.php b/src/BlockHorizons/FactionsPE/command/PermShow.php similarity index 73% rename from src/fpe/command/PermShow.php rename to src/BlockHorizons/FactionsPE/command/PermShow.php index ae47e30..d4e68f9 100755 --- a/src/fpe/command/PermShow.php +++ b/src/BlockHorizons/FactionsPE/command/PermShow.php @@ -4,16 +4,16 @@ * Copyright (C) 2020 BlockHorizons */ -namespace fpe\command; - -use fpe\command\parameter\FactionParameter; -use fpe\command\parameter\PermissionParameter; -use fpe\dominate\Command; -use fpe\dominate\parameter\Parameter; -use fpe\manager\Pemrissions; -use fpe\permission\Permission; -use fpe\utils\Pager; -use fpe\utils\Text; +namespace BlockHorizons\FactionsPE\command; + +use BlockHorizons\FactionsPE\command\parameter\FactionParameter; +use BlockHorizons\FactionsPE\command\parameter\PermissionParameter; +use BlockHorizons\FactionsPE\dominate\Command; +use BlockHorizons\FactionsPE\dominate\parameter\Parameter; +use BlockHorizons\FactionsPE\manager\Pemrissions; +use BlockHorizons\FactionsPE\permission\Permission; +use BlockHorizons\FactionsPE\utils\Pager; +use BlockHorizons\FactionsPE\utils\Text; use pocketmine\command\CommandSender; class PermShow extends Command diff --git a/src/fpe/command/Player.php b/src/BlockHorizons/FactionsPE/command/Player.php similarity index 85% rename from src/fpe/command/Player.php rename to src/BlockHorizons/FactionsPE/command/Player.php index 2fee1cc..ae47dae 100755 --- a/src/fpe/command/Player.php +++ b/src/BlockHorizons/FactionsPE/command/Player.php @@ -1,13 +1,13 @@ . */ -namespace fpe\command; +namespace BlockHorizons\FactionsPE\command; -use fpe\command\parameter\FactionParameter; -use fpe\command\parameter\MemberParameter; -use fpe\command\parameter\RankParameter; -use fpe\dominate\Command; -use fpe\localizer\Localizer; -use fpe\manager\Members; -use fpe\manager\Permissions; -use fpe\relation\Relation; +use BlockHorizons\FactionsPE\command\parameter\FactionParameter; +use BlockHorizons\FactionsPE\command\parameter\MemberParameter; +use BlockHorizons\FactionsPE\command\parameter\RankParameter; +use BlockHorizons\FactionsPE\dominate\Command; +use BlockHorizons\FactionsPE\localizer\Localizer; +use BlockHorizons\FactionsPE\manager\Members; +use BlockHorizons\FactionsPE\manager\Permissions; +use BlockHorizons\FactionsPE\relation\Relation; use pocketmine\command\CommandSender; class Rank extends Command diff --git a/src/fpe/command/RankQuickset.php b/src/BlockHorizons/FactionsPE/command/RankQuickset.php similarity index 89% rename from src/fpe/command/RankQuickset.php rename to src/BlockHorizons/FactionsPE/command/RankQuickset.php index 6a60951..32325af 100644 --- a/src/fpe/command/RankQuickset.php +++ b/src/BlockHorizons/FactionsPE/command/RankQuickset.php @@ -17,10 +17,10 @@ *   along with this program. If not, see . */ -namespace fpe\command; +namespace BlockHorizons\FactionsPE\command; -use fpe\dominate\Command; -use fpe\command\parameter\MemberParameter; +use BlockHorizons\FactionsPE\dominate\Command; +use BlockHorizons\FactionsPE\command\parameter\MemberParameter; use pocketmine\command\CommandSender; use pocketmine\Server; diff --git a/src/fpe/command/Relation.php b/src/BlockHorizons/FactionsPE/command/Relation.php similarity index 73% rename from src/fpe/command/Relation.php rename to src/BlockHorizons/FactionsPE/command/Relation.php index ab3d9b6..363974e 100755 --- a/src/fpe/command/Relation.php +++ b/src/BlockHorizons/FactionsPE/command/Relation.php @@ -4,11 +4,11 @@ * Copyright (C) 2020 BlockHorizons */ -namespace fpe\command; +namespace BlockHorizons\FactionsPE\command; -use fpe\dominate\Command; -use fpe\dominate\parameter\Parameter; -use fpe\manager\Permissions; +use BlockHorizons\FactionsPE\dominate\Command; +use BlockHorizons\FactionsPE\dominate\parameter\Parameter; +use BlockHorizons\FactionsPE\manager\Permissions; class Relation extends Command { diff --git a/src/fpe/command/RelationList.php b/src/BlockHorizons/FactionsPE/command/RelationList.php similarity index 84% rename from src/fpe/command/RelationList.php rename to src/BlockHorizons/FactionsPE/command/RelationList.php index 2465b86..d5e2b25 100644 --- a/src/fpe/command/RelationList.php +++ b/src/BlockHorizons/FactionsPE/command/RelationList.php @@ -6,21 +6,21 @@ * Time: 00:43 */ -namespace fpe\command; +namespace BlockHorizons\FactionsPE\command; -use fpe\dominate\Command; -use fpe\dominate\parameter\Parameter; -use fpe\command\parameter\FactionParameter; -use fpe\command\parameter\RelationParameter; -use fpe\entity\Faction; -use fpe\manager\Factions; -use fpe\utils\Pager; -use fpe\localizer\Localizer; +use BlockHorizons\FactionsPE\dominate\Command; +use BlockHorizons\FactionsPE\dominate\parameter\Parameter; +use BlockHorizons\FactionsPE\command\parameter\FactionParameter; +use BlockHorizons\FactionsPE\command\parameter\RelationParameter; +use BlockHorizons\FactionsPE\entity\Faction; +use BlockHorizons\FactionsPE\manager\Factions; +use BlockHorizons\FactionsPE\utils\Pager; +use BlockHorizons\FactionsPE\localizer\Localizer; use pocketmine\command\CommandSender; use pocketmine\command\ConsoleCommandSender; use pocketmine\utils\TextFormat; -use fpe\relation\Relation as Rel; +use BlockHorizons\FactionsPE\relation\Relation as Rel; class RelationList extends Command { diff --git a/src/fpe/command/RelationSet.php b/src/BlockHorizons/FactionsPE/command/RelationSet.php similarity index 82% rename from src/fpe/command/RelationSet.php rename to src/BlockHorizons/FactionsPE/command/RelationSet.php index dd72dbd..a9e9937 100644 --- a/src/fpe/command/RelationSet.php +++ b/src/BlockHorizons/FactionsPE/command/RelationSet.php @@ -6,17 +6,17 @@ * Time: 22:58 */ -namespace fpe\command; +namespace BlockHorizons\FactionsPE\command; -use fpe\dominate\Command; -use fpe\command\parameter\FactionParameter; -use fpe\command\parameter\RelationParameter; -use fpe\entity\Faction; -use fpe\event\faction\FactionRelationChangeEvent; -use fpe\flag\Flag; -use fpe\manager\Members; -use fpe\relation\Relation as Rel; -use fpe\localizer\Localizer; +use BlockHorizons\FactionsPE\dominate\Command; +use BlockHorizons\FactionsPE\command\parameter\FactionParameter; +use BlockHorizons\FactionsPE\command\parameter\RelationParameter; +use BlockHorizons\FactionsPE\entity\Faction; +use BlockHorizons\FactionsPE\event\faction\FactionRelationChangeEvent; +use BlockHorizons\FactionsPE\flag\Flag; +use BlockHorizons\FactionsPE\manager\Members; +use BlockHorizons\FactionsPE\relation\Relation as Rel; +use BlockHorizons\FactionsPE\localizer\Localizer; use pocketmine\command\CommandSender; class RelationSet extends Command { diff --git a/src/fpe/command/RelationSetQuick.php b/src/BlockHorizons/FactionsPE/command/RelationSetQuick.php similarity index 77% rename from src/fpe/command/RelationSetQuick.php rename to src/BlockHorizons/FactionsPE/command/RelationSetQuick.php index e5c4bdb..c52ec0e 100644 --- a/src/fpe/command/RelationSetQuick.php +++ b/src/BlockHorizons/FactionsPE/command/RelationSetQuick.php @@ -6,10 +6,10 @@ * Time: 23:40 */ -namespace fpe\command; +namespace BlockHorizons\FactionsPE\command; -use fpe\dominate\Command; -use fpe\command\parameter\FactionParameter; +use BlockHorizons\FactionsPE\dominate\Command; +use BlockHorizons\FactionsPE\command\parameter\FactionParameter; use pocketmine\command\CommandSender; class RelationSetQuick extends Command { diff --git a/src/fpe/command/RelationWishes.php b/src/BlockHorizons/FactionsPE/command/RelationWishes.php similarity index 81% rename from src/fpe/command/RelationWishes.php rename to src/BlockHorizons/FactionsPE/command/RelationWishes.php index 2965dc0..1cfa0ca 100644 --- a/src/fpe/command/RelationWishes.php +++ b/src/BlockHorizons/FactionsPE/command/RelationWishes.php @@ -6,19 +6,19 @@ * Time: 00:43 */ -namespace fpe\command; +namespace BlockHorizons\FactionsPE\command; -use fpe\dominate\Command; -use fpe\dominate\parameter\Parameter; -use fpe\command\parameter\FactionParameter; -use fpe\entity\Faction; -use fpe\manager\Factions; -use fpe\utils\Pager; -use fpe\localizer\Localizer; +use BlockHorizons\FactionsPE\dominate\Command; +use BlockHorizons\FactionsPE\dominate\parameter\Parameter; +use BlockHorizons\FactionsPE\command\parameter\FactionParameter; +use BlockHorizons\FactionsPE\entity\Faction; +use BlockHorizons\FactionsPE\manager\Factions; +use BlockHorizons\FactionsPE\utils\Pager; +use BlockHorizons\FactionsPE\localizer\Localizer; use pocketmine\command\CommandSender; use pocketmine\command\ConsoleCommandSender; -use fpe\relation\Relation as Rel; +use BlockHorizons\FactionsPE\relation\Relation as Rel; class RelationWishes extends Command { diff --git a/src/fpe/command/Reload.php b/src/BlockHorizons/FactionsPE/command/Reload.php similarity index 78% rename from src/fpe/command/Reload.php rename to src/BlockHorizons/FactionsPE/command/Reload.php index f9979df..16a7262 100755 --- a/src/fpe/command/Reload.php +++ b/src/BlockHorizons/FactionsPE/command/Reload.php @@ -4,11 +4,11 @@ * Copyright (C) 2020 BlockHorizons */ -namespace fpe\command; +namespace BlockHorizons\FactionsPE\command; -use fpe\dominate\Command; -use fpe\localizer\Localizer; -use fpe\utils\Gameplay; +use BlockHorizons\FactionsPE\dominate\Command; +use BlockHorizons\FactionsPE\localizer\Localizer; +use BlockHorizons\FactionsPE\utils\Gameplay; use pocketmine\command\CommandSender; class Reload extends Command diff --git a/src/fpe/command/SeeChunk.php b/src/BlockHorizons/FactionsPE/command/SeeChunk.php similarity index 77% rename from src/fpe/command/SeeChunk.php rename to src/BlockHorizons/FactionsPE/command/SeeChunk.php index d477a16..f5dec5f 100644 --- a/src/fpe/command/SeeChunk.php +++ b/src/BlockHorizons/FactionsPE/command/SeeChunk.php @@ -1,16 +1,16 @@ has(($msender = Members::get($sender)), $you->getFaction(), true)) return true; // Rank Check - if (!$msender->isOverriding() && \fpe\relation\Relation::isHigherThan($you->getRole(), $msender->getRole())) { + if (!$msender->isOverriding() && \BlockHorizons\FactionsPE\relation\Relation::isHigherThan($you->getRole(), $msender->getRole())) { return Text::parse("You can not edit titles for higher ranks."); } diff --git a/src/fpe/command/Top.php b/src/BlockHorizons/FactionsPE/command/Top.php similarity index 86% rename from src/fpe/command/Top.php rename to src/BlockHorizons/FactionsPE/command/Top.php index 066f945..044cb6f 100755 --- a/src/fpe/command/Top.php +++ b/src/BlockHorizons/FactionsPE/command/Top.php @@ -1,14 +1,14 @@ . */ -namespace fpe\dominate; +namespace BlockHorizons\FactionsPE\dominate; -use fpe\dominate\parameter\Parameter; -use fpe\dominate\requirement\Requirement; +use BlockHorizons\FactionsPE\dominate\parameter\Parameter; +use BlockHorizons\FactionsPE\dominate\requirement\Requirement; use InvalidArgumentException; -use fpe\localizer\Localizer; +use BlockHorizons\FactionsPE\localizer\Localizer; use LogicException; use pocketmine\command\Command as PocketMineCommand; use pocketmine\command\CommandSender; diff --git a/src/fpe/dominate/Link.php b/src/BlockHorizons/FactionsPE/dominate/Link.php similarity index 94% rename from src/fpe/dominate/Link.php rename to src/BlockHorizons/FactionsPE/dominate/Link.php index 538c962..1939c3c 100755 --- a/src/fpe/dominate/Link.php +++ b/src/BlockHorizons/FactionsPE/dominate/Link.php @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -namespace fpe\dominate; +namespace BlockHorizons\FactionsPE\dominate; use pocketmine\command\CommandSender; diff --git a/src/fpe/dominate/ThrowableMessage.php b/src/BlockHorizons/FactionsPE/dominate/ThrowableMessage.php similarity index 89% rename from src/fpe/dominate/ThrowableMessage.php rename to src/BlockHorizons/FactionsPE/dominate/ThrowableMessage.php index df50411..2cf5b2e 100755 --- a/src/fpe/dominate/ThrowableMessage.php +++ b/src/BlockHorizons/FactionsPE/dominate/ThrowableMessage.php @@ -16,11 +16,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -namespace fpe\dominate; +namespace BlockHorizons\FactionsPE\dominate; use Exception; -use fpe\localizer\Translatable; -use fpe\localizer\Localizer; +use BlockHorizons\FactionsPE\localizer\Translatable; +use BlockHorizons\FactionsPE\localizer\Localizer; class ThrowableMessage extends Exception { diff --git a/src/fpe/dominate/parameter/Parameter.php b/src/BlockHorizons/FactionsPE/dominate/parameter/Parameter.php similarity index 97% rename from src/fpe/dominate/parameter/Parameter.php rename to src/BlockHorizons/FactionsPE/dominate/parameter/Parameter.php index 2dabc2c..cbf6d74 100755 --- a/src/fpe/dominate/parameter/Parameter.php +++ b/src/BlockHorizons/FactionsPE/dominate/parameter/Parameter.php @@ -16,14 +16,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -namespace fpe\dominate\parameter; +namespace BlockHorizons\FactionsPE\dominate\parameter; -use fpe\dominate\Command; +use BlockHorizons\FactionsPE\dominate\Command; use pocketmine\command\CommandSender; use pocketmine\Player; -use fpe\localizer\Translatable; -use fpe\localizer\Localizer; +use BlockHorizons\FactionsPE\localizer\Translatable; +use BlockHorizons\FactionsPE\localizer\Localizer; class Parameter { diff --git a/src/fpe/dominate/requirement/Requirement.php b/src/BlockHorizons/FactionsPE/dominate/requirement/Requirement.php similarity index 91% rename from src/fpe/dominate/requirement/Requirement.php rename to src/BlockHorizons/FactionsPE/dominate/requirement/Requirement.php index 8f73896..d56ade9 100755 --- a/src/fpe/dominate/requirement/Requirement.php +++ b/src/BlockHorizons/FactionsPE/dominate/requirement/Requirement.php @@ -16,10 +16,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -namespace fpe\dominate\requirement; +namespace BlockHorizons\FactionsPE\dominate\requirement; use pocketmine\command\CommandSender; -use fpe\localizer\Translatable; +use BlockHorizons\FactionsPE\localizer\Translatable; abstract class Requirement { diff --git a/src/fpe/dominate/requirement/SimpleRequirement.php b/src/BlockHorizons/FactionsPE/dominate/requirement/SimpleRequirement.php similarity index 95% rename from src/fpe/dominate/requirement/SimpleRequirement.php rename to src/BlockHorizons/FactionsPE/dominate/requirement/SimpleRequirement.php index a258ed3..35f6f9b 100755 --- a/src/fpe/dominate/requirement/SimpleRequirement.php +++ b/src/BlockHorizons/FactionsPE/dominate/requirement/SimpleRequirement.php @@ -16,12 +16,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -namespace fpe\dominate\requirement; +namespace BlockHorizons\FactionsPE\dominate\requirement; use pocketmine\command\CommandSender; use pocketmine\command\ConsoleCommandSender; use pocketmine\Player; -use fpe\localizer\Translatable; +use BlockHorizons\FactionsPE\localizer\Translatable; class SimpleRequirement extends Requirement { diff --git a/src/fpe/economizer/Economizer.php b/src/BlockHorizons/FactionsPE/economizer/Economizer.php similarity index 87% rename from src/fpe/economizer/Economizer.php rename to src/BlockHorizons/FactionsPE/economizer/Economizer.php index 9f4b3c8..6da9ec0 100755 --- a/src/fpe/economizer/Economizer.php +++ b/src/BlockHorizons/FactionsPE/economizer/Economizer.php @@ -17,15 +17,15 @@ * along with this program. If not, see . */ - namespace fpe\economizer; + namespace BlockHorizons\FactionsPE\economizer; -use fpe\economizer\transistor\iEconomy; +use BlockHorizons\FactionsPE\economizer\transistor\iEconomy; use pocketmine\plugin\Plugin; -use fpe\economizer\transistor\EconomyAPI; -use fpe\economizer\transistor\PocketMoney; -use fpe\economizer\transistor\MassiveEconomy; -use fpe\economizer\transistor\EssentialsPE; +use BlockHorizons\FactionsPE\economizer\transistor\EconomyAPI; +use BlockHorizons\FactionsPE\economizer\transistor\PocketMoney; +use BlockHorizons\FactionsPE\economizer\transistor\MassiveEconomy; +use BlockHorizons\FactionsPE\economizer\transistor\EssentialsPE; class Economizer { diff --git a/src/fpe/economizer/Transistor.php b/src/BlockHorizons/FactionsPE/economizer/Transistor.php similarity index 97% rename from src/fpe/economizer/Transistor.php rename to src/BlockHorizons/FactionsPE/economizer/Transistor.php index 3db5bc4..38017ad 100755 --- a/src/fpe/economizer/Transistor.php +++ b/src/BlockHorizons/FactionsPE/economizer/Transistor.php @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -namespace fpe\economizer; +namespace BlockHorizons\FactionsPE\economizer; use pocketmine\Player; use pocketmine\plugin\Plugin; diff --git a/src/fpe/economizer/transistor/EconomyAPI.php b/src/BlockHorizons/FactionsPE/economizer/transistor/EconomyAPI.php similarity index 95% rename from src/fpe/economizer/transistor/EconomyAPI.php rename to src/BlockHorizons/FactionsPE/economizer/transistor/EconomyAPI.php index c6a38a2..3fdba78 100755 --- a/src/fpe/economizer/transistor/EconomyAPI.php +++ b/src/BlockHorizons/FactionsPE/economizer/transistor/EconomyAPI.php @@ -17,13 +17,13 @@ * along with this program. If not, see . */ -namespace fpe\economizer\transistor; +namespace BlockHorizons\FactionsPE\economizer\transistor; use pocketmine\Player; use onebone\economyapi\EconomyAPI as EAPI; -use fpe\economizer\Transistor; +use BlockHorizons\FactionsPE\economizer\Transistor; class EconomyAPI extends Transistor { diff --git a/src/fpe/economizer/transistor/EssentialsPE.php b/src/BlockHorizons/FactionsPE/economizer/transistor/EssentialsPE.php similarity index 95% rename from src/fpe/economizer/transistor/EssentialsPE.php rename to src/BlockHorizons/FactionsPE/economizer/transistor/EssentialsPE.php index eb9f475..c30bfca 100755 --- a/src/fpe/economizer/transistor/EssentialsPE.php +++ b/src/BlockHorizons/FactionsPE/economizer/transistor/EssentialsPE.php @@ -17,11 +17,11 @@ * along with this program. If not, see . */ -namespace fpe\economizer\transistor; +namespace BlockHorizons\FactionsPE\economizer\transistor; use pocketmine\Player; use EssentialsPE\Loader; use EssentialsPE\BaseFiles\BaseAPI; -use fpe\economizer\Transistor; +use BlockHorizons\FactionsPE\economizer\Transistor; class EssentialsPE extends Transistor { diff --git a/src/fpe/economizer/transistor/MassiveEconomy.php b/src/BlockHorizons/FactionsPE/economizer/transistor/MassiveEconomy.php similarity index 95% rename from src/fpe/economizer/transistor/MassiveEconomy.php rename to src/BlockHorizons/FactionsPE/economizer/transistor/MassiveEconomy.php index e5ff0c1..7493650 100755 --- a/src/fpe/economizer/transistor/MassiveEconomy.php +++ b/src/BlockHorizons/FactionsPE/economizer/transistor/MassiveEconomy.php @@ -17,11 +17,11 @@ * along with this program. If not, see . */ -namespace fpe\economizer\transistor; +namespace BlockHorizons\FactionsPE\economizer\transistor; use pocketmine\Player; use MassiveEconomy\MassiveEconomyAPI; -use fpe\economizer\Transistor; +use BlockHorizons\FactionsPE\economizer\Transistor; class MassiveEconomy extends Transistor { diff --git a/src/fpe/economizer/transistor/PocketMoney.php b/src/BlockHorizons/FactionsPE/economizer/transistor/PocketMoney.php similarity index 96% rename from src/fpe/economizer/transistor/PocketMoney.php rename to src/BlockHorizons/FactionsPE/economizer/transistor/PocketMoney.php index e8449a2..893a12c 100755 --- a/src/fpe/economizer/transistor/PocketMoney.php +++ b/src/BlockHorizons/FactionsPE/economizer/transistor/PocketMoney.php @@ -17,11 +17,11 @@ * along with this program. If not, see . */ -namespace fpe\economizer\transistor; +namespace BlockHorizons\FactionsPE\economizer\transistor; use pocketmine\Player; use PocketMoney\PocketMoney as PMAPI; -use fpe\economizer\Transistor; +use BlockHorizons\FactionsPE\economizer\Transistor; class PocketMoney extends Transistor { diff --git a/src/fpe/economizer/transistor/iEconomy.php b/src/BlockHorizons/FactionsPE/economizer/transistor/iEconomy.php similarity index 93% rename from src/fpe/economizer/transistor/iEconomy.php rename to src/BlockHorizons/FactionsPE/economizer/transistor/iEconomy.php index e11cb9f..0f1a1d2 100644 --- a/src/fpe/economizer/transistor/iEconomy.php +++ b/src/BlockHorizons/FactionsPE/economizer/transistor/iEconomy.php @@ -6,10 +6,10 @@ * Time: 14:50 */ -namespace fpe\economizer\transistor; +namespace BlockHorizons\FactionsPE\economizer\transistor; -use fpe\economizer\Transistor; +use BlockHorizons\FactionsPE\economizer\Transistor; use pocketmine\Player; use economy\iEconomy as IE; diff --git a/src/fpe/engine/BoardEngine.php b/src/BlockHorizons/FactionsPE/engine/BoardEngine.php similarity index 93% rename from src/fpe/engine/BoardEngine.php rename to src/BlockHorizons/FactionsPE/engine/BoardEngine.php index 3179fca..d59748e 100644 --- a/src/fpe/engine/BoardEngine.php +++ b/src/BlockHorizons/FactionsPE/engine/BoardEngine.php @@ -4,16 +4,16 @@ * Copyright (C) 2020 BlockHorizons */ -namespace fpe\engine; - -use fpe\command\Relation; -use fpe\entity\FConsole; -use fpe\entity\Member; -use fpe\event\member\MembershipChangeEvent; -use fpe\FactionsPE; -use fpe\manager\Members; -use fpe\utils\ASCIICompass; -use fpe\utils\Text; +namespace BlockHorizons\FactionsPE\engine; + +use BlockHorizons\FactionsPE\command\Relation; +use BlockHorizons\FactionsPE\entity\FConsole; +use BlockHorizons\FactionsPE\entity\Member; +use BlockHorizons\FactionsPE\event\member\MembershipChangeEvent; +use BlockHorizons\FactionsPE\FactionsPE; +use BlockHorizons\FactionsPE\manager\Members; +use BlockHorizons\FactionsPE\utils\ASCIICompass; +use BlockHorizons\FactionsPE\utils\Text; use jasonwynn10\ScoreboardAPI\Scoreboard; use jasonwynn10\ScoreboardAPI\ScoreboardAPI; use jasonwynn10\ScoreboardAPI\ScoreboardEntry; @@ -80,8 +80,8 @@ public static function parseLine(string $text, Member $member): string $member->getFactionHere()->getName(), Text::getRelationColor($member->getRelationToPlot()), $player->getFloorX(), $player->getFloorY(), $player->getFloorZ(), - ASCIICompass::getFullDirection($player->getYaw()), - ASCIICompass::getCompassPointForDirection($player->getYaw()), + ASCIICompass::getFullDirection($player->getYaw() ?? .0), + ASCIICompass::getCompassPointForDirection($player->getYaw() ?? .0), count($faction->getOnlineMembers()), count($faction->getMembers()), count(Server::getInstance()->getOnlinePlayers()), @@ -206,4 +206,4 @@ public function onMembershipChange(MembershipChangeEvent $event) { self::sendBoard($member, $event->isLeaving() ? "factionless" : "faction"); } -} \ No newline at end of file +} diff --git a/src/fpe/engine/ChatEngine.php b/src/BlockHorizons/FactionsPE/engine/ChatEngine.php similarity index 94% rename from src/fpe/engine/ChatEngine.php rename to src/BlockHorizons/FactionsPE/engine/ChatEngine.php index 92b06cd..07366cd 100755 --- a/src/fpe/engine/ChatEngine.php +++ b/src/BlockHorizons/FactionsPE/engine/ChatEngine.php @@ -4,13 +4,13 @@ * Copyright (C) 2020 BlockHorizons */ -namespace fpe\engine; +namespace BlockHorizons\FactionsPE\engine; use _64FF00\PureChat\PureChat; -use fpe\localizer\Localizer; -use fpe\manager\Members; -use fpe\utils\Gameplay; -use fpe\utils\Text; +use BlockHorizons\FactionsPE\localizer\Localizer; +use BlockHorizons\FactionsPE\manager\Members; +use BlockHorizons\FactionsPE\utils\Gameplay; +use BlockHorizons\FactionsPE\utils\Text; use pocketmine\event\player\PlayerChatEvent; /** diff --git a/src/fpe/engine/CombatEngine.php b/src/BlockHorizons/FactionsPE/engine/CombatEngine.php similarity index 95% rename from src/fpe/engine/CombatEngine.php rename to src/BlockHorizons/FactionsPE/engine/CombatEngine.php index 5feec80..a2d70b4 100755 --- a/src/fpe/engine/CombatEngine.php +++ b/src/BlockHorizons/FactionsPE/engine/CombatEngine.php @@ -4,14 +4,14 @@ * Copyright (C) 2020 BlockHorizons */ -namespace fpe\engine; - -use fpe\flag\Flag; -use fpe\localizer\Localizer; -use fpe\manager\Members; -use fpe\manager\Plots; -use fpe\relation\Relation; -use fpe\utils\Gameplay; +namespace BlockHorizons\FactionsPE\engine; + +use BlockHorizons\FactionsPE\flag\Flag; +use BlockHorizons\FactionsPE\localizer\Localizer; +use BlockHorizons\FactionsPE\manager\Members; +use BlockHorizons\FactionsPE\manager\Plots; +use BlockHorizons\FactionsPE\relation\Relation; +use BlockHorizons\FactionsPE\utils\Gameplay; use pocketmine\event\entity\EntityDamageByEntityEvent; use pocketmine\event\entity\EntityDamageEvent; use pocketmine\event\player\PlayerDeathEvent; diff --git a/src/fpe/engine/Engine.php b/src/BlockHorizons/FactionsPE/engine/Engine.php similarity index 95% rename from src/fpe/engine/Engine.php rename to src/BlockHorizons/FactionsPE/engine/Engine.php index 47d3eaa..9e9f0e0 100755 --- a/src/fpe/engine/Engine.php +++ b/src/BlockHorizons/FactionsPE/engine/Engine.php @@ -4,9 +4,9 @@ * Copyright (C) 2020 BlockHorizons */ -namespace fpe\engine; +namespace BlockHorizons\FactionsPE\engine; -use fpe\FactionsPE; +use BlockHorizons\FactionsPE\FactionsPE; use pocketmine\event\Listener; use pocketmine\plugin\PluginLogger; use pocketmine\scheduler\Task; diff --git a/src/fpe/engine/ExploitEngine.php b/src/BlockHorizons/FactionsPE/engine/ExploitEngine.php similarity index 95% rename from src/fpe/engine/ExploitEngine.php rename to src/BlockHorizons/FactionsPE/engine/ExploitEngine.php index 60dc36e..53ebd89 100755 --- a/src/fpe/engine/ExploitEngine.php +++ b/src/BlockHorizons/FactionsPE/engine/ExploitEngine.php @@ -4,9 +4,9 @@ * Copyright (C) 2020 BlockHorizons */ -namespace fpe\engine; +namespace BlockHorizons\FactionsPE\engine; -use fpe\utils\Gameplay; +use BlockHorizons\FactionsPE\utils\Gameplay; use pocketmine\block\Block; use pocketmine\block\Liquid; use pocketmine\entity\object\PrimedTNT; diff --git a/src/fpe/engine/MainEngine.php b/src/BlockHorizons/FactionsPE/engine/MainEngine.php similarity index 96% rename from src/fpe/engine/MainEngine.php rename to src/BlockHorizons/FactionsPE/engine/MainEngine.php index a8b78c6..2102c92 100755 --- a/src/fpe/engine/MainEngine.php +++ b/src/BlockHorizons/FactionsPE/engine/MainEngine.php @@ -17,23 +17,23 @@ * along with this program. If not, see . */ -namespace fpe\engine; - -use fpe\entity\Member; -use fpe\entity\Plot; -use fpe\event\LandChangeEvent; -use fpe\event\member\MemberPowerChangeEvent; -use fpe\event\member\MemberTraceEvent; -use fpe\FactionsPE; -use fpe\flag\Flag; -use fpe\localizer\Localizer; -use fpe\manager\Members; -use fpe\manager\Permissions; -use fpe\manager\Plots; -use fpe\permission\Permission; -use fpe\relation\Relation; -use fpe\utils\Gameplay; -use fpe\utils\Text; +namespace BlockHorizons\FactionsPE\engine; + +use BlockHorizons\FactionsPE\entity\Member; +use BlockHorizons\FactionsPE\entity\Plot; +use BlockHorizons\FactionsPE\event\LandChangeEvent; +use BlockHorizons\FactionsPE\event\member\MemberPowerChangeEvent; +use BlockHorizons\FactionsPE\event\member\MemberTraceEvent; +use BlockHorizons\FactionsPE\FactionsPE; +use BlockHorizons\FactionsPE\flag\Flag; +use BlockHorizons\FactionsPE\localizer\Localizer; +use BlockHorizons\FactionsPE\manager\Members; +use BlockHorizons\FactionsPE\manager\Permissions; +use BlockHorizons\FactionsPE\manager\Plots; +use BlockHorizons\FactionsPE\permission\Permission; +use BlockHorizons\FactionsPE\relation\Relation; +use BlockHorizons\FactionsPE\utils\Gameplay; +use BlockHorizons\FactionsPE\utils\Text; use pocketmine\block\Block; use pocketmine\block\BlockIds; use pocketmine\block\Liquid; diff --git a/src/fpe/engine/SeeChunkEngine.php b/src/BlockHorizons/FactionsPE/engine/SeeChunkEngine.php similarity index 95% rename from src/fpe/engine/SeeChunkEngine.php rename to src/BlockHorizons/FactionsPE/engine/SeeChunkEngine.php index fb6a9ca..12fc64d 100644 --- a/src/fpe/engine/SeeChunkEngine.php +++ b/src/BlockHorizons/FactionsPE/engine/SeeChunkEngine.php @@ -1,14 +1,14 @@ . */ -namespace fpe\event\member; +namespace BlockHorizons\FactionsPE\event\member; -use fpe\entity\Member; -use fpe\entity\Plot; +use BlockHorizons\FactionsPE\entity\Member; +use BlockHorizons\FactionsPE\entity\Plot; /** * When player walks into another chunk diff --git a/src/fpe/event/member/MembershipChangeEvent.php b/src/BlockHorizons/FactionsPE/event/member/MembershipChangeEvent.php similarity index 91% rename from src/fpe/event/member/MembershipChangeEvent.php rename to src/BlockHorizons/FactionsPE/event/member/MembershipChangeEvent.php index 77112ef..631ce4d 100755 --- a/src/fpe/event/member/MembershipChangeEvent.php +++ b/src/BlockHorizons/FactionsPE/event/member/MembershipChangeEvent.php @@ -4,10 +4,10 @@ * Copyright (C) 2020 BlockHorizons */ -namespace fpe\event\member; +namespace BlockHorizons\FactionsPE\event\member; -use fpe\entity\Faction; -use fpe\entity\IMember; +use BlockHorizons\FactionsPE\entity\Faction; +use BlockHorizons\FactionsPE\entity\IMember; use LogicException; use pocketmine\event\Cancellable; diff --git a/src/fpe/flag/Flag.php b/src/BlockHorizons/FactionsPE/flag/Flag.php similarity index 97% rename from src/fpe/flag/Flag.php rename to src/BlockHorizons/FactionsPE/flag/Flag.php index c9beb4e..0f31295 100755 --- a/src/fpe/flag/Flag.php +++ b/src/BlockHorizons/FactionsPE/flag/Flag.php @@ -4,10 +4,10 @@ * Copyright (C) 2020 BlockHorizons */ -namespace fpe\flag; +namespace BlockHorizons\FactionsPE\flag; -use fpe\localizer\Translatable; -use fpe\utils\Text; +use BlockHorizons\FactionsPE\localizer\Translatable; +use BlockHorizons\FactionsPE\utils\Text; use pocketmine\utils\TextFormat; class Flag diff --git a/src/fpe/form/FactionForm.php b/src/BlockHorizons/FactionsPE/form/FactionForm.php similarity index 95% rename from src/fpe/form/FactionForm.php rename to src/BlockHorizons/FactionsPE/form/FactionForm.php index 624bd9b..464b477 100644 --- a/src/fpe/form/FactionForm.php +++ b/src/BlockHorizons/FactionsPE/form/FactionForm.php @@ -1,12 +1,12 @@ . */ -use fpe\localizer\iso\ISO_639_1; +use BlockHorizons\FactionsPE\localizer\iso\ISO_639_1; /** * Easy to use translate package diff --git a/src/fpe/localizer/Translatable.php b/src/BlockHorizons/FactionsPE/localizer/Translatable.php similarity index 97% rename from src/fpe/localizer/Translatable.php rename to src/BlockHorizons/FactionsPE/localizer/Translatable.php index 3f552ed..34baffb 100755 --- a/src/fpe/localizer/Translatable.php +++ b/src/BlockHorizons/FactionsPE/localizer/Translatable.php @@ -1,5 +1,5 @@ . */ -namespace fpe\localizer\iso; +namespace BlockHorizons\FactionsPE\localizer\iso; class ISO_639_1 { diff --git a/src/fpe/manager/Factions.php b/src/BlockHorizons/FactionsPE/manager/Factions.php similarity index 95% rename from src/fpe/manager/Factions.php rename to src/BlockHorizons/FactionsPE/manager/Factions.php index 3248d04..20e4963 100755 --- a/src/fpe/manager/Factions.php +++ b/src/BlockHorizons/FactionsPE/manager/Factions.php @@ -4,14 +4,14 @@ * Copyright (C) 2020 BlockHorizons */ -namespace fpe\manager; - -use fpe\data\FactionData; -use fpe\entity\Faction; -use fpe\entity\IMember; -use fpe\flag\Flag; -use fpe\permission\Permission; -use fpe\relation\Relation; +namespace BlockHorizons\FactionsPE\manager; + +use BlockHorizons\FactionsPE\data\FactionData; +use BlockHorizons\FactionsPE\entity\Faction; +use BlockHorizons\FactionsPE\entity\IMember; +use BlockHorizons\FactionsPE\flag\Flag; +use BlockHorizons\FactionsPE\permission\Permission; +use BlockHorizons\FactionsPE\relation\Relation; use pocketmine\IPlayer; class Factions diff --git a/src/fpe/manager/Flags.php b/src/BlockHorizons/FactionsPE/manager/Flags.php similarity index 94% rename from src/fpe/manager/Flags.php rename to src/BlockHorizons/FactionsPE/manager/Flags.php index aa4c3cb..6003d2b 100755 --- a/src/fpe/manager/Flags.php +++ b/src/BlockHorizons/FactionsPE/manager/Flags.php @@ -4,12 +4,12 @@ * Copyright (C) 2020 BlockHorizons */ -namespace fpe\manager; +namespace BlockHorizons\FactionsPE\manager; -use fpe\FactionsPE; -use fpe\flag\Flag; -use fpe\localizer\Localizer; -use fpe\localizer\Translatable; +use BlockHorizons\FactionsPE\FactionsPE; +use BlockHorizons\FactionsPE\flag\Flag; +use BlockHorizons\FactionsPE\localizer\Localizer; +use BlockHorizons\FactionsPE\localizer\Translatable; class Flags { diff --git a/src/fpe/manager/Members.php b/src/BlockHorizons/FactionsPE/manager/Members.php similarity index 92% rename from src/fpe/manager/Members.php rename to src/BlockHorizons/FactionsPE/manager/Members.php index 4753110..59cdb1e 100755 --- a/src/fpe/manager/Members.php +++ b/src/BlockHorizons/FactionsPE/manager/Members.php @@ -4,13 +4,13 @@ * Copyright (C) 2020 BlockHorizons */ -namespace fpe\manager; +namespace BlockHorizons\FactionsPE\manager; -use fpe\entity\IMember; -use fpe\entity\Member; -use fpe\entity\OfflineMember; -use fpe\FactionsPE; -use fpe\utils\Text; +use BlockHorizons\FactionsPE\entity\IMember; +use BlockHorizons\FactionsPE\entity\Member; +use BlockHorizons\FactionsPE\entity\OfflineMember; +use BlockHorizons\FactionsPE\FactionsPE; +use BlockHorizons\FactionsPE\utils\Text; use InvalidArgumentException; use pocketmine\command\CommandSender; use pocketmine\command\ConsoleCommandSender; diff --git a/src/fpe/manager/Permissions.php b/src/BlockHorizons/FactionsPE/manager/Permissions.php similarity index 95% rename from src/fpe/manager/Permissions.php rename to src/BlockHorizons/FactionsPE/manager/Permissions.php index ffc3ed3..f8b9a09 100755 --- a/src/fpe/manager/Permissions.php +++ b/src/BlockHorizons/FactionsPE/manager/Permissions.php @@ -4,14 +4,14 @@ * Copyright (C) 2020 BlockHorizons */ -namespace fpe\manager; +namespace BlockHorizons\FactionsPE\manager; use Exception; -use fpe\FactionsPE; -use fpe\permission\Permission; -use fpe\relation\Relation; -use fpe\localizer\Localizer; -use fpe\localizer\Translatable; +use BlockHorizons\FactionsPE\FactionsPE; +use BlockHorizons\FactionsPE\permission\Permission; +use BlockHorizons\FactionsPE\relation\Relation; +use BlockHorizons\FactionsPE\localizer\Localizer; +use BlockHorizons\FactionsPE\localizer\Translatable; final class Permissions { diff --git a/src/fpe/manager/Plots.php b/src/BlockHorizons/FactionsPE/manager/Plots.php similarity index 96% rename from src/fpe/manager/Plots.php rename to src/BlockHorizons/FactionsPE/manager/Plots.php index 4d45eee..538c17b 100755 --- a/src/fpe/manager/Plots.php +++ b/src/BlockHorizons/FactionsPE/manager/Plots.php @@ -4,14 +4,14 @@ * Copyright (C) 2020 BlockHorizons */ -namespace fpe\manager; +namespace BlockHorizons\FactionsPE\manager; -use fpe\entity\Faction; -use fpe\entity\IMember; -use fpe\entity\Plot; -use fpe\event\LandChangeEvent; -use fpe\FactionsPE; -use fpe\localizer\Localizer; +use BlockHorizons\FactionsPE\entity\Faction; +use BlockHorizons\FactionsPE\entity\IMember; +use BlockHorizons\FactionsPE\entity\Plot; +use BlockHorizons\FactionsPE\event\LandChangeEvent; +use BlockHorizons\FactionsPE\FactionsPE; +use BlockHorizons\FactionsPE\localizer\Localizer; use pocketmine\level\Level; use pocketmine\level\Position; diff --git a/src/fpe/permission/Permission.php b/src/BlockHorizons/FactionsPE/permission/Permission.php similarity index 90% rename from src/fpe/permission/Permission.php rename to src/BlockHorizons/FactionsPE/permission/Permission.php index 3d2ad6a..6779ee0 100755 --- a/src/fpe/permission/Permission.php +++ b/src/BlockHorizons/FactionsPE/permission/Permission.php @@ -4,15 +4,15 @@ * Copyright (C) 2020 BlockHorizons */ -namespace fpe\permission; - -use fpe\entity\Faction; -use fpe\entity\IMember; -use fpe\manager\Permissions; -use fpe\relation\Relation; -use fpe\relation\RelationParticipator; -use fpe\utils\Text; -use fpe\localizer\Translatable; +namespace BlockHorizons\FactionsPE\permission; + +use BlockHorizons\FactionsPE\entity\Faction; +use BlockHorizons\FactionsPE\entity\IMember; +use BlockHorizons\FactionsPE\manager\Permissions; +use BlockHorizons\FactionsPE\relation\Relation; +use BlockHorizons\FactionsPE\relation\RelationParticipator; +use BlockHorizons\FactionsPE\utils\Text; +use BlockHorizons\FactionsPE\localizer\Translatable; class Permission { diff --git a/src/fpe/permission/Permissions.php b/src/BlockHorizons/FactionsPE/permission/Permissions.php similarity index 100% rename from src/fpe/permission/Permissions.php rename to src/BlockHorizons/FactionsPE/permission/Permissions.php diff --git a/src/fpe/relation/Relation.php b/src/BlockHorizons/FactionsPE/relation/Relation.php similarity index 96% rename from src/fpe/relation/Relation.php rename to src/BlockHorizons/FactionsPE/relation/Relation.php index aba63a8..891f022 100755 --- a/src/fpe/relation/Relation.php +++ b/src/BlockHorizons/FactionsPE/relation/Relation.php @@ -4,13 +4,13 @@ * Copyright (C) 2020 BlockHorizons */ -namespace fpe\relation; +namespace BlockHorizons\FactionsPE\relation; -use fpe\entity\Faction; -use fpe\entity\IMember; -use fpe\flag\Flag; -use fpe\utils\Gameplay; -use fpe\utils\Text; +use BlockHorizons\FactionsPE\entity\Faction; +use BlockHorizons\FactionsPE\entity\IMember; +use BlockHorizons\FactionsPE\flag\Flag; +use BlockHorizons\FactionsPE\utils\Gameplay; +use BlockHorizons\FactionsPE\utils\Text; use pocketmine\utils\TextFormat; final class Relation diff --git a/src/fpe/relation/RelationParticipator.php b/src/BlockHorizons/FactionsPE/relation/RelationParticipator.php similarity index 90% rename from src/fpe/relation/RelationParticipator.php rename to src/BlockHorizons/FactionsPE/relation/RelationParticipator.php index b74b414..3068d4f 100755 --- a/src/fpe/relation/RelationParticipator.php +++ b/src/BlockHorizons/FactionsPE/relation/RelationParticipator.php @@ -4,7 +4,7 @@ * Copyright (C) 2020 BlockHorizons */ -namespace fpe\relation; +namespace BlockHorizons\FactionsPE\relation; interface RelationParticipator { diff --git a/src/fpe/task/HUD.php b/src/BlockHorizons/FactionsPE/task/HUD.php similarity index 89% rename from src/fpe/task/HUD.php rename to src/BlockHorizons/FactionsPE/task/HUD.php index b52c57b..7223c2a 100755 --- a/src/fpe/task/HUD.php +++ b/src/BlockHorizons/FactionsPE/task/HUD.php @@ -1,12 +1,12 @@ getHome(); $contains = in_array($hereFaction, $fList, true); - if ($home instanceof Position && $m->getFaction() === $hereFaction || $m->isOverriding()) { - if ($home->x >> Plots::$CHUNK_SIZE === $herePs->x && $home->z >> Plots::$CHUNK_SIZE === $herePs->z) { - $row .= $hereFaction->getColorTo($m) . self::MAP_KEY_HOME; - } else { - goto draw_char; + if ($m->getFaction() === $hereFaction || $m->isOverriding()) { + if($home instanceof Position) { + if ($home->x >> Plots::$CHUNK_SIZE === $herePs->x && $home->z >> Plots::$CHUNK_SIZE === $herePs->z) { + $row .= $hereFaction->getColorTo($m) . self::MAP_KEY_HOME; + } else { + goto draw_char; + } } } else { draw_char: diff --git a/src/fpe/utils/Gameplay.php b/src/BlockHorizons/FactionsPE/utils/Gameplay.php similarity index 96% rename from src/fpe/utils/Gameplay.php rename to src/BlockHorizons/FactionsPE/utils/Gameplay.php index 9ffda8d..2bce7b2 100755 --- a/src/fpe/utils/Gameplay.php +++ b/src/BlockHorizons/FactionsPE/utils/Gameplay.php @@ -4,7 +4,7 @@ * Copyright (C) 2020 BlockHorizons */ -namespace fpe\utils; +namespace BlockHorizons\FactionsPE\utils; final class Gameplay { diff --git a/src/fpe/utils/Pager.php b/src/BlockHorizons/FactionsPE/utils/Pager.php similarity index 96% rename from src/fpe/utils/Pager.php rename to src/BlockHorizons/FactionsPE/utils/Pager.php index 93bf9c9..3107ac5 100755 --- a/src/fpe/utils/Pager.php +++ b/src/BlockHorizons/FactionsPE/utils/Pager.php @@ -1,9 +1,9 @@