diff --git a/Pocket/plugins/Mineplex/src/mineplex/plugin/Main.php b/Pocket/plugins/Mineplex/src/mineplex/plugin/Main.php index 655d6451e..7d52c10a9 100644 --- a/Pocket/plugins/Mineplex/src/mineplex/plugin/Main.php +++ b/Pocket/plugins/Mineplex/src/mineplex/plugin/Main.php @@ -2,9 +2,9 @@ namespace mineplex\plugin; -use mineplex\plugin\bench\arenas\MultiGameArena; -use mineplex\plugin\bench\game\components\world\WorldComponent; -use mineplex\plugin\bench\game\factory\TestGameFactory; +use mineplex\plugin\gameengine\arenas\MultiGameArena; +use mineplex\plugin\gameengine\game\components\world\WorldComponent; +use mineplex\plugin\gameengine\game\factory\TestGameFactory; use mineplex\plugin\core\updater\Updater; use pocketmine\event\Listener; use pocketmine\event\player\PlayerJoinEvent; @@ -12,7 +12,7 @@ use pocketmine\event\player\PlayerLoginEvent; use pocketmine\level\Position; use pocketmine\math\Vector3; use pocketmine\plugin\PluginBase; -use mineplex\plugin\bench\arenas\Arena; +use mineplex\plugin\gameengine\arenas\Arena; use pocketmine\Server; class Main extends PluginBase implements Listener diff --git a/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/arenas/Arena.php b/Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/arenas/Arena.php similarity index 92% rename from Pocket/plugins/Mineplex/src/mineplex/plugin/bench/arenas/Arena.php rename to Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/arenas/Arena.php index 8d7165749..4e008f4c6 100644 --- a/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/arenas/Arena.php +++ b/Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/arenas/Arena.php @@ -5,7 +5,7 @@ * Date: 6/30/2015 * Time: 1:35 PM */ -namespace mineplex\plugin\bench\arenas; +namespace mineplex\plugin\gameengine\arenas; use pocketmine\plugin\Plugin; use pocketmine\Player; diff --git a/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/arenas/ArenaEvent.php b/Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/arenas/ArenaEvent.php similarity index 87% rename from Pocket/plugins/Mineplex/src/mineplex/plugin/bench/arenas/ArenaEvent.php rename to Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/arenas/ArenaEvent.php index ef0f8dac0..03d94fcf4 100644 --- a/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/arenas/ArenaEvent.php +++ b/Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/arenas/ArenaEvent.php @@ -5,7 +5,7 @@ * Date: 6/30/2015 * Time: 9:06 PM */ -namespace mineplex\plugin\bench\arenas; +namespace mineplex\plugin\gameengine\arenas; use pocketmine\event\Event; diff --git a/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/arenas/MultiGameArena.php b/Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/arenas/MultiGameArena.php similarity index 83% rename from Pocket/plugins/Mineplex/src/mineplex/plugin/bench/arenas/MultiGameArena.php rename to Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/arenas/MultiGameArena.php index 660d4e60d..30a017f48 100644 --- a/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/arenas/MultiGameArena.php +++ b/Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/arenas/MultiGameArena.php @@ -6,26 +6,25 @@ * Time: 12:14 PM */ -namespace mineplex\plugin\bench\arenas; +namespace mineplex\plugin\gameengine\arenas; -use mineplex\plugin\bench\arenas\events\ArenaEndEvent; -use mineplex\plugin\bench\game\factory\GameFactory; +use mineplex\plugin\gameengine\arenas\events\ArenaEndEvent; +use mineplex\plugin\gameengine\game\factory\GameFactory; use pocketmine\event\Listener; use pocketmine\plugin\Plugin; use pocketmine\event\player\PlayerJoinEvent; use pocketmine\event\player\PlayerQuitEvent; use pocketmine\Player; use pocketmine\Server; -use mineplex\plugin\bench\game\Game; -use mineplex\plugin\bench\arenas\events\ArenaCanJoinEvent; -use mineplex\plugin\bench\arenas\events\ArenaJoinEvent; -use mineplex\plugin\bench\arenas\events\ArenaQuitEvent; -use mineplex\plugin\bench\arenas\events\ArenaStartEvent; +use mineplex\plugin\gameengine\game\Game; +use mineplex\plugin\gameengine\arenas\events\ArenaCanJoinEvent; +use mineplex\plugin\gameengine\arenas\events\ArenaJoinEvent; +use mineplex\plugin\gameengine\arenas\events\ArenaQuitEvent; +use mineplex\plugin\gameengine\arenas\events\ArenaStartEvent; class MultiGameArena implements Arena, Listener { - /** @var Player[] */ private $players = array(); diff --git a/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/arenas/SingleGameArena.php b/Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/arenas/SingleGameArena.php similarity index 87% rename from Pocket/plugins/Mineplex/src/mineplex/plugin/bench/arenas/SingleGameArena.php rename to Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/arenas/SingleGameArena.php index b5fefc275..bd0f1902c 100644 --- a/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/arenas/SingleGameArena.php +++ b/Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/arenas/SingleGameArena.php @@ -5,20 +5,20 @@ * Date: 6/30/2015 * Time: 1:37 PM */ -namespace mineplex\plugin\bench\arenas; +namespace mineplex\plugin\gameengine\arenas; -use mineplex\plugin\bench\arenas\events\ArenaEndEvent; +use mineplex\plugin\gameengine\arenas\events\ArenaEndEvent; use pocketmine\event\Listener; use pocketmine\plugin\Plugin; use pocketmine\event\player\PlayerJoinEvent; use pocketmine\event\player\PlayerQuitEvent; use pocketmine\Player; use pocketmine\Server; -use mineplex\plugin\bench\game\Game; -use mineplex\plugin\bench\arenas\events\ArenaCanJoinEvent; -use mineplex\plugin\bench\arenas\events\ArenaJoinEvent; -use mineplex\plugin\bench\arenas\events\ArenaQuitEvent; -use mineplex\plugin\bench\arenas\events\ArenaStartEvent; +use mineplex\plugin\gameengine\game\Game; +use mineplex\plugin\gameengine\arenas\events\ArenaCanJoinEvent; +use mineplex\plugin\gameengine\arenas\events\ArenaJoinEvent; +use mineplex\plugin\gameengine\arenas\events\ArenaQuitEvent; +use mineplex\plugin\gameengine\arenas\events\ArenaStartEvent; class SingleGameArena implements Arena, Listener { //I really have no idea if there is a better way to store players... but this is what I'm using for now. diff --git a/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/arenas/events/ArenaCanJoinEvent.php b/Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/arenas/events/ArenaCanJoinEvent.php similarity index 77% rename from Pocket/plugins/Mineplex/src/mineplex/plugin/bench/arenas/events/ArenaCanJoinEvent.php rename to Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/arenas/events/ArenaCanJoinEvent.php index f45b71c7f..d2d73e4e4 100644 --- a/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/arenas/events/ArenaCanJoinEvent.php +++ b/Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/arenas/events/ArenaCanJoinEvent.php @@ -5,12 +5,12 @@ * Date: 6/30/2015 * Time: 9:22 PM */ -namespace mineplex\plugin\bench\arenas\events; +namespace mineplex\plugin\gameengine\arenas\events; use pocketmine\event\Cancellable; use pocketmine\Player; -use mineplex\plugin\bench\arenas\ArenaEvent; -use mineplex\plugin\bench\arenas\Arena; +use mineplex\plugin\gameengine\arenas\ArenaEvent; +use mineplex\plugin\gameengine\arenas\Arena; class ArenaCanJoinEvent extends ArenaEvent implements Cancellable { public static $handlerList = null; diff --git a/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/arenas/events/ArenaEndEvent.php b/Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/arenas/events/ArenaEndEvent.php similarity index 64% rename from Pocket/plugins/Mineplex/src/mineplex/plugin/bench/arenas/events/ArenaEndEvent.php rename to Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/arenas/events/ArenaEndEvent.php index 241f4bcfb..defcb2d54 100644 --- a/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/arenas/events/ArenaEndEvent.php +++ b/Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/arenas/events/ArenaEndEvent.php @@ -5,10 +5,10 @@ * Date: 6/30/2015 * Time: 10:12 PM */ -namespace mineplex\plugin\bench\arenas\events; +namespace mineplex\plugin\gameengine\arenas\events; -use mineplex\plugin\bench\arenas\ArenaEvent; -use mineplex\plugin\bench\arenas\Arena; +use mineplex\plugin\gameengine\arenas\ArenaEvent; +use mineplex\plugin\gameengine\arenas\Arena; class ArenaEndEvent extends ArenaEvent{ diff --git a/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/arenas/events/ArenaJoinEvent.php b/Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/arenas/events/ArenaJoinEvent.php similarity index 74% rename from Pocket/plugins/Mineplex/src/mineplex/plugin/bench/arenas/events/ArenaJoinEvent.php rename to Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/arenas/events/ArenaJoinEvent.php index c0d3adbc2..42335b757 100644 --- a/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/arenas/events/ArenaJoinEvent.php +++ b/Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/arenas/events/ArenaJoinEvent.php @@ -5,13 +5,13 @@ * Date: 6/30/2015 * Time: 9:22 PM */ -namespace mineplex\plugin\bench\arenas\events; +namespace mineplex\plugin\gameengine\arenas\events; use pocketmine\Player; -use mineplex\plugin\bench\arenas\ArenaEvent; +use mineplex\plugin\gameengine\arenas\ArenaEvent; -use mineplex\plugin\bench\arenas\Arena; +use mineplex\plugin\gameengine\arenas\Arena; class ArenaJoinEvent extends ArenaEvent { public static $handlerList = null; diff --git a/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/arenas/events/ArenaQuitEvent.php b/Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/arenas/events/ArenaQuitEvent.php similarity index 74% rename from Pocket/plugins/Mineplex/src/mineplex/plugin/bench/arenas/events/ArenaQuitEvent.php rename to Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/arenas/events/ArenaQuitEvent.php index 8c225b1fd..2a191c34b 100644 --- a/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/arenas/events/ArenaQuitEvent.php +++ b/Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/arenas/events/ArenaQuitEvent.php @@ -6,11 +6,11 @@ * Time: 9:22 PM */ -namespace mineplex\plugin\bench\arenas\events; +namespace mineplex\plugin\gameengine\arenas\events; use pocketmine\Player; -use mineplex\plugin\bench\arenas\ArenaEvent; -use mineplex\plugin\bench\arenas\Arena; +use mineplex\plugin\gameengine\arenas\ArenaEvent; +use mineplex\plugin\gameengine\arenas\Arena; class ArenaQuitEvent extends ArenaEvent { public static $handlerList = null; diff --git a/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/arenas/events/ArenaStartEvent.php b/Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/arenas/events/ArenaStartEvent.php similarity index 64% rename from Pocket/plugins/Mineplex/src/mineplex/plugin/bench/arenas/events/ArenaStartEvent.php rename to Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/arenas/events/ArenaStartEvent.php index dd3db8d24..62c906086 100644 --- a/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/arenas/events/ArenaStartEvent.php +++ b/Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/arenas/events/ArenaStartEvent.php @@ -5,10 +5,10 @@ * Date: 6/30/2015 * Time: 10:12 PM */ -namespace mineplex\plugin\bench\arenas\events; +namespace mineplex\plugin\gameengine\arenas\events; -use mineplex\plugin\bench\arenas\ArenaEvent; -use mineplex\plugin\bench\arenas\Arena; +use mineplex\plugin\gameengine\arenas\ArenaEvent; +use mineplex\plugin\gameengine\arenas\Arena; class ArenaStartEvent extends ArenaEvent{ public static $handlerList = null; diff --git a/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/Game.php b/Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/game/Game.php similarity index 63% rename from Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/Game.php rename to Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/game/Game.php index afbb38aba..e13be6dc9 100644 --- a/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/Game.php +++ b/Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/game/Game.php @@ -5,9 +5,9 @@ * Date: 6/30/2015 * Time: 9:04 PM */ -namespace mineplex\plugin\bench\game; +namespace mineplex\plugin\gameengine\game; -use mineplex\plugin\bench\arenas\Arena; +use mineplex\plugin\gameengine\arenas\Arena; interface Game { public function start(Arena $arena); diff --git a/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/components/countdown/GameStateCountdown.php b/Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/game/components/countdown/GameStateCountdown.php similarity index 80% rename from Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/components/countdown/GameStateCountdown.php rename to Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/game/components/countdown/GameStateCountdown.php index b5ec2ad92..0ee90f870 100644 --- a/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/components/countdown/GameStateCountdown.php +++ b/Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/game/components/countdown/GameStateCountdown.php @@ -6,18 +6,18 @@ * Time: 5:52 PM */ -namespace mineplex\plugin\bench\game\components\countdown; +namespace mineplex\plugin\gameengine\game\components\countdown; -use mineplex\plugin\bench\arenas\Arena; -use mineplex\plugin\bench\arenas\events\ArenaEndEvent; -use mineplex\plugin\bench\game\components\gamestate\GameStateComponent; -use mineplex\plugin\bench\time\BenchSchedule; -use mineplex\plugin\bench\time\BenchTask; -use mineplex\plugin\bench\time\BenchTaskData; +use mineplex\plugin\gameengine\arenas\Arena; +use mineplex\plugin\gameengine\arenas\events\ArenaEndEvent; +use mineplex\plugin\gameengine\game\components\gamestate\GameStateComponent; +use mineplex\plugin\gameengine\time\BenchSchedule; +use mineplex\plugin\gameengine\time\BenchTask; +use mineplex\plugin\gameengine\time\BenchTaskData; use pocketmine\event\HandlerList; use pocketmine\event\Listener; use pocketmine\Server; -use mineplex\plugin\bench\game\components\gamestate\events\GameStateChangeEvent; +use mineplex\plugin\gameengine\game\components\gamestate\events\GameStateChangeEvent; class GameStateCountdown implements Listener, BenchTask { diff --git a/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/components/feature/Feature.php b/Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/game/components/feature/Feature.php similarity index 80% rename from Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/components/feature/Feature.php rename to Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/game/components/feature/Feature.php index e5e2d02e1..4cdce7af7 100644 --- a/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/components/feature/Feature.php +++ b/Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/game/components/feature/Feature.php @@ -6,7 +6,7 @@ * Time: 10:18 PM */ -namespace mineplex\plugin\bench\game\components\feature; +namespace mineplex\plugin\gameengine\game\components\feature; interface Feature { diff --git a/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/components/feature/GameStateFeatureManager.php b/Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/game/components/feature/GameStateFeatureManager.php similarity index 88% rename from Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/components/feature/GameStateFeatureManager.php rename to Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/game/components/feature/GameStateFeatureManager.php index 8bd247929..a414e94b9 100644 --- a/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/components/feature/GameStateFeatureManager.php +++ b/Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/game/components/feature/GameStateFeatureManager.php @@ -6,13 +6,13 @@ * Time: 12:44 AM */ -namespace mineplex\plugin\bench\game\components\feature; +namespace mineplex\plugin\gameengine\game\components\feature; -use mineplex\plugin\bench\arenas\Arena; -use mineplex\plugin\bench\arenas\events\ArenaEndEvent; -use mineplex\plugin\bench\game\components\gamestate\events\GameStateChangeEvent; -use mineplex\plugin\bench\game\components\gamestate\GameState; +use mineplex\plugin\gameengine\arenas\Arena; +use mineplex\plugin\gameengine\arenas\events\ArenaEndEvent; +use mineplex\plugin\gameengine\game\components\gamestate\events\GameStateChangeEvent; +use mineplex\plugin\gameengine\game\components\gamestate\GameState; use pocketmine\event\HandlerList; use pocketmine\event\Listener; use pocketmine\Server; diff --git a/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/components/feature/features/NoBlockBreak.php b/Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/game/components/feature/features/NoBlockBreak.php similarity index 91% rename from Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/components/feature/features/NoBlockBreak.php rename to Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/game/components/feature/features/NoBlockBreak.php index ed7398b0d..35e2c02db 100644 --- a/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/components/feature/features/NoBlockBreak.php +++ b/Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/game/components/feature/features/NoBlockBreak.php @@ -6,10 +6,10 @@ * Time: 10:20 PM */ -namespace mineplex\plugin\bench\game\components\feature\features; +namespace mineplex\plugin\gameengine\game\components\feature\features; -use mineplex\plugin\bench\arenas\Arena; -use mineplex\plugin\bench\game\components\feature\Feature; +use mineplex\plugin\gameengine\arenas\Arena; +use mineplex\plugin\gameengine\game\components\feature\Feature; use pocketmine\event\block\BlockBreakEvent; use pocketmine\event\HandlerList; use pocketmine\event\Listener; diff --git a/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/components/feature/features/NoMovement.php b/Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/game/components/feature/features/NoMovement.php similarity index 85% rename from Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/components/feature/features/NoMovement.php rename to Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/game/components/feature/features/NoMovement.php index e1994b845..eb91e6d0c 100644 --- a/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/components/feature/features/NoMovement.php +++ b/Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/game/components/feature/features/NoMovement.php @@ -6,10 +6,10 @@ * Time: 10:20 PM */ -namespace mineplex\plugin\bench\game\components\feature\features; +namespace mineplex\plugin\gameengine\game\components\feature\features; -use mineplex\plugin\bench\arenas\Arena; -use mineplex\plugin\bench\game\components\feature\Feature; +use mineplex\plugin\gameengine\arenas\Arena; +use mineplex\plugin\gameengine\game\components\feature\Feature; use pocketmine\entity\Effect; use pocketmine\event\block\BlockBreakEvent; use pocketmine\event\HandlerList; diff --git a/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/components/gamestate/GameState.php b/Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/game/components/gamestate/GameState.php similarity index 83% rename from Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/components/gamestate/GameState.php rename to Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/game/components/gamestate/GameState.php index 92d72f974..dcb2504bf 100644 --- a/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/components/gamestate/GameState.php +++ b/Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/game/components/gamestate/GameState.php @@ -6,7 +6,7 @@ * Time: 10:33 AM */ -namespace mineplex\plugin\bench\game\components\gamestate; +namespace mineplex\plugin\gameengine\game\components\gamestate; //Yes yes I know this is a horrible way of doing things, I'm just trying to get done fast. diff --git a/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/components/gamestate/GameStateComponent.php b/Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/game/components/gamestate/GameStateComponent.php similarity index 86% rename from Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/components/gamestate/GameStateComponent.php rename to Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/game/components/gamestate/GameStateComponent.php index ea79c9141..016942ea2 100644 --- a/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/components/gamestate/GameStateComponent.php +++ b/Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/game/components/gamestate/GameStateComponent.php @@ -6,12 +6,12 @@ * Time: 10:26 AM */ -namespace mineplex\plugin\bench\game\components\gamestate; +namespace mineplex\plugin\gameengine\game\components\gamestate; -use mineplex\plugin\bench\arenas\events\ArenaEndEvent; -use mineplex\plugin\bench\arenas\events\ArenaStartEvent; -use mineplex\plugin\bench\game\components\gamestate\events\GameStateChangeEvent; -use mineplex\plugin\bench\arenas\Arena; +use mineplex\plugin\gameengine\arenas\events\ArenaEndEvent; +use mineplex\plugin\gameengine\arenas\events\ArenaStartEvent; +use mineplex\plugin\gameengine\game\components\gamestate\events\GameStateChangeEvent; +use mineplex\plugin\gameengine\arenas\Arena; use pocketmine\event\HandlerList; use pocketmine\event\Listener; use pocketmine\Server; diff --git a/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/components/gamestate/events/GameStateChangeEvent.php b/Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/game/components/gamestate/events/GameStateChangeEvent.php similarity index 79% rename from Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/components/gamestate/events/GameStateChangeEvent.php rename to Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/game/components/gamestate/events/GameStateChangeEvent.php index a83dbe009..bf7e4f385 100644 --- a/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/components/gamestate/events/GameStateChangeEvent.php +++ b/Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/game/components/gamestate/events/GameStateChangeEvent.php @@ -6,10 +6,10 @@ * Time: 10:49 AM */ -namespace mineplex\plugin\bench\game\components\gamestate\events; +namespace mineplex\plugin\gameengine\game\components\gamestate\events; -use mineplex\plugin\bench\arenas\ArenaEvent; -use mineplex\plugin\bench\arenas\Arena; +use mineplex\plugin\gameengine\arenas\ArenaEvent; +use mineplex\plugin\gameengine\arenas\Arena; class GameStateChangeEvent extends ArenaEvent { diff --git a/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/components/lobby/LobbyComponent.php b/Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/game/components/lobby/LobbyComponent.php similarity index 90% rename from Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/components/lobby/LobbyComponent.php rename to Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/game/components/lobby/LobbyComponent.php index 510ae58eb..8f07066a4 100644 --- a/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/components/lobby/LobbyComponent.php +++ b/Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/game/components/lobby/LobbyComponent.php @@ -6,15 +6,15 @@ * Time: 11:10 PM */ -namespace mineplex\plugin\bench\game\components\lobby; +namespace mineplex\plugin\gameengine\game\components\lobby; -use mineplex\plugin\bench\arenas\Arena; -use mineplex\plugin\bench\arenas\events\ArenaEndEvent; -use mineplex\plugin\bench\arenas\events\ArenaJoinEvent; -use mineplex\plugin\bench\game\components\feature\Feature; -use mineplex\plugin\bench\game\components\gamestate\events\GameStateChangeEvent; -use mineplex\plugin\bench\game\components\gamestate\GameState; +use mineplex\plugin\gameengine\arenas\Arena; +use mineplex\plugin\gameengine\arenas\events\ArenaEndEvent; +use mineplex\plugin\gameengine\arenas\events\ArenaJoinEvent; +use mineplex\plugin\gameengine\game\components\feature\Feature; +use mineplex\plugin\gameengine\game\components\gamestate\events\GameStateChangeEvent; +use mineplex\plugin\gameengine\game\components\gamestate\GameState; use pocketmine\event\block\BlockBreakEvent; use pocketmine\event\entity\EntityDamageEvent; use pocketmine\event\entity\EntityShootBowEvent; diff --git a/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/components/world/WorldComponent.php b/Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/game/components/world/WorldComponent.php similarity index 96% rename from Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/components/world/WorldComponent.php rename to Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/game/components/world/WorldComponent.php index 0fbf814ee..fe6a1bc99 100644 --- a/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/components/world/WorldComponent.php +++ b/Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/game/components/world/WorldComponent.php @@ -6,11 +6,11 @@ * Time: 12:27 PM */ -namespace mineplex\plugin\bench\game\components\world; +namespace mineplex\plugin\gameengine\game\components\world; -use mineplex\plugin\bench\arenas\Arena; -use mineplex\plugin\bench\game\components\world\event\WorldLoadFailEvent; -use mineplex\plugin\bench\game\components\world\event\WorldLoadSuccessEvent; +use mineplex\plugin\gameengine\arenas\Arena; +use mineplex\plugin\gameengine\game\components\world\event\WorldLoadFailEvent; +use mineplex\plugin\gameengine\game\components\world\event\WorldLoadSuccessEvent; use mineplex\plugin\util\UtilString; use mineplex\plugin\core\updater\UpdateEvent; use mineplex\plugin\core\updater\UpdateType; diff --git a/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/factory/GameFactory.php b/Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/game/factory/GameFactory.php similarity index 66% rename from Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/factory/GameFactory.php rename to Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/game/factory/GameFactory.php index 2b2b97455..257f404e8 100644 --- a/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/factory/GameFactory.php +++ b/Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/game/factory/GameFactory.php @@ -6,9 +6,9 @@ * Time: 1:12 PM */ -namespace mineplex\plugin\bench\game\factory; +namespace mineplex\plugin\gameengine\game\factory; -use mineplex\plugin\bench\game\Game; +use mineplex\plugin\gameengine\game\Game; interface GameFactory { /** diff --git a/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/factory/TestGameFactory.php b/Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/game/factory/TestGameFactory.php similarity index 65% rename from Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/factory/TestGameFactory.php rename to Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/game/factory/TestGameFactory.php index 953b81b0b..316e4c679 100644 --- a/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/factory/TestGameFactory.php +++ b/Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/game/factory/TestGameFactory.php @@ -6,10 +6,10 @@ * Time: 3:03 PM */ -namespace mineplex\plugin\bench\game\factory; +namespace mineplex\plugin\gameengine\game\factory; -use mineplex\plugin\bench\game\games\sg\SurvivalGames; +use mineplex\plugin\gameengine\game\games\sg\SurvivalGames; class TestGameFactory implements GameFactory { diff --git a/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/games/pvp/Pvp.php b/Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/game/games/pvp/Pvp.php similarity index 66% rename from Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/games/pvp/Pvp.php rename to Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/game/games/pvp/Pvp.php index 8c4d1a137..2be9b6eb6 100644 --- a/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/games/pvp/Pvp.php +++ b/Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/game/games/pvp/Pvp.php @@ -5,17 +5,17 @@ * Date: 6/30/2015 * Time: 9:18 PM */ -namespace mineplex\plugin\bench\game\games\pvp; +namespace mineplex\plugin\gameengine\game\games\pvp; -use mineplex\plugin\bench\game\components\countdown\GameStateCountdown; -use mineplex\plugin\bench\game\components\feature\features\NoBlockBreak; -use mineplex\plugin\bench\game\components\feature\GameStateFeatureManager; -use mineplex\plugin\bench\game\components\gamestate\GameState; -use mineplex\plugin\bench\game\components\gamestate\GameStateComponent; +use mineplex\plugin\gameengine\game\components\countdown\GameStateCountdown; +use mineplex\plugin\gameengine\game\components\feature\features\NoBlockBreak; +use mineplex\plugin\gameengine\game\components\feature\GameStateFeatureManager; +use mineplex\plugin\gameengine\game\components\gamestate\GameState; +use mineplex\plugin\gameengine\game\components\gamestate\GameStateComponent; use pocketmine\event\Listener; -use mineplex\plugin\bench\game\Game; -use mineplex\plugin\bench\arenas\Arena; -use mineplex\plugin\bench\game\components\feature\Feature; +use mineplex\plugin\gameengine\game\Game; +use mineplex\plugin\gameengine\arenas\Arena; +use mineplex\plugin\gameengine\game\components\feature\Feature; use pocketmine\item\Item; class Pvp implements Game, Listener { diff --git a/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/games/pvp/PvpComponent.php b/Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/game/games/pvp/PvpComponent.php similarity index 88% rename from Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/games/pvp/PvpComponent.php rename to Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/game/games/pvp/PvpComponent.php index 7fa7d151e..9f86dee71 100644 --- a/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/games/pvp/PvpComponent.php +++ b/Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/game/games/pvp/PvpComponent.php @@ -6,16 +6,16 @@ * Time: 10:15 PM */ -namespace mineplex\plugin\bench\game\games\pvp; +namespace mineplex\plugin\gameengine\game\games\pvp; use pocketmine\event\Listener; use pocketmine\Server; use pocketmine\event\HandlerList; use pocketmine\event\player\PlayerDeathEvent; -use mineplex\plugin\bench\arenas\events\ArenaQuitEvent; -use mineplex\plugin\bench\arenas\events\ArenaJoinEvent; -use mineplex\plugin\bench\arenas\events\ArenaEndEvent; -use mineplex\plugin\bench\arenas\Arena; +use mineplex\plugin\gameengine\arenas\events\ArenaQuitEvent; +use mineplex\plugin\gameengine\arenas\events\ArenaJoinEvent; +use mineplex\plugin\gameengine\arenas\events\ArenaEndEvent; +use mineplex\plugin\gameengine\arenas\Arena; diff --git a/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/games/sg/SurvivalGames.php b/Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/game/games/sg/SurvivalGames.php similarity index 65% rename from Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/games/sg/SurvivalGames.php rename to Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/game/games/sg/SurvivalGames.php index 1f28552e1..2636056f9 100644 --- a/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/game/games/sg/SurvivalGames.php +++ b/Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/game/games/sg/SurvivalGames.php @@ -6,17 +6,17 @@ * Time: 3:09 PM */ -namespace mineplex\plugin\bench\game\games\sg; +namespace mineplex\plugin\gameengine\game\games\sg; -use mineplex\plugin\bench\game\components\countdown\GameStateCountdown; -use mineplex\plugin\bench\game\components\feature\features\NoBlockBreak; -use mineplex\plugin\bench\game\components\feature\GameStateFeatureManager; -use mineplex\plugin\bench\game\components\gamestate\GameState; -use mineplex\plugin\bench\game\components\gamestate\GameStateComponent; -use mineplex\plugin\bench\game\components\lobby\LobbyComponent; -use mineplex\plugin\bench\game\Game; -use mineplex\plugin\bench\arenas\Arena; -use mineplex\plugin\bench\game\components\feature\Feature; +use mineplex\plugin\gameengine\game\components\countdown\GameStateCountdown; +use mineplex\plugin\gameengine\game\components\feature\features\NoBlockBreak; +use mineplex\plugin\gameengine\game\components\feature\GameStateFeatureManager; +use mineplex\plugin\gameengine\game\components\gamestate\GameState; +use mineplex\plugin\gameengine\game\components\gamestate\GameStateComponent; +use mineplex\plugin\gameengine\game\components\lobby\LobbyComponent; +use mineplex\plugin\gameengine\game\Game; +use mineplex\plugin\gameengine\arenas\Arena; +use mineplex\plugin\gameengine\game\components\feature\Feature; use pocketmine\item\Item; class SurvivalGames implements Game { diff --git a/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/time/BenchSchedule.php b/Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/time/BenchSchedule.php similarity index 98% rename from Pocket/plugins/Mineplex/src/mineplex/plugin/bench/time/BenchSchedule.php rename to Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/time/BenchSchedule.php index 3c3794a42..a6ed2a870 100644 --- a/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/time/BenchSchedule.php +++ b/Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/time/BenchSchedule.php @@ -6,7 +6,7 @@ * Time: 1:53 PM */ -namespace mineplex\plugin\bench\time; +namespace mineplex\plugin\gameengine\time; use pocketmine\scheduler\Task; use pocketmine\Server; diff --git a/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/time/BenchTask.php b/Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/time/BenchTask.php similarity index 81% rename from Pocket/plugins/Mineplex/src/mineplex/plugin/bench/time/BenchTask.php rename to Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/time/BenchTask.php index 6aaf8283b..98b45f4c6 100644 --- a/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/time/BenchTask.php +++ b/Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/time/BenchTask.php @@ -6,7 +6,7 @@ * Time: 2:01 PM */ -namespace mineplex\plugin\bench\time; +namespace mineplex\plugin\gameengine\time; use SplObjectStorage; diff --git a/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/time/BenchTaskData.php b/Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/time/BenchTaskData.php similarity index 96% rename from Pocket/plugins/Mineplex/src/mineplex/plugin/bench/time/BenchTaskData.php rename to Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/time/BenchTaskData.php index 3ab5c2943..8c6ca1e8f 100644 --- a/Pocket/plugins/Mineplex/src/mineplex/plugin/bench/time/BenchTaskData.php +++ b/Pocket/plugins/Mineplex/src/mineplex/plugin/gameengine/time/BenchTaskData.php @@ -6,7 +6,7 @@ * Time: 2:03 PM */ -namespace mineplex\plugin\bench\time; +namespace mineplex\plugin\gameengine\time;