Merge pull request #94 from BlockHorizons/scoreboard

Poggito three. Fix #93 #92 #91

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:

src/fpe/FactionsPE.php → 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;
 

src/fpe/command/Balance.php → 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

src/fpe/command/Chat.php → 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

src/fpe/command/Claim.php → 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
 {

src/fpe/command/ClaimAll.php → 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;
 

src/fpe/command/ClaimAuto.php → 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

src/fpe/command/ClaimOne.php → 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

src/fpe/command/ClaimSquare.php → 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

src/fpe/command/ClaimX.php → 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;
 

src/fpe/command/ClaimXRadius.php → 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
 {

src/fpe/command/Close.php → 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

src/fpe/command/CreateFaction.php → 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;
 

src/fpe/command/Deposit.php → 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

src/fpe/command/Description.php → 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;
 

src/fpe/command/Disband.php → 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;