Merge branch 'release/0.0.2'

Author: InkoHX

plugin.yml

@@ -1,11 +1,12 @@
 name: TheMix
 main: VectorNetworkProject\TheMix\TheMix
 api: 3.0.0
-prefix: TheMix
+softdepend:
+- ScoreboardsPE
 
 description: "Original game of VectorNetwork"
 website: "https://vector-network.tk"
-version: 0.0.1
+version: 0.0.2
 authors:
 - InkoHX
 - MazaiCrafty

src/VectorNetworkProject/TheMix/DataBase.php

@@ -12,6 +12,10 @@
 use pocketmine\plugin\PluginBase;
 use pocketmine\utils\TextFormat;
 use VectorNetworkProject\TheMix\command\PingCommand;
+use VectorNetworkProject\TheMix\command\TpsCommand;
+use VectorNetworkProject\TheMix\event\ThePlayerJoinEvent;
+use VectorNetworkProject\TheMix\event\ThePlayerLoginEvent;
+use VectorNetworkProject\TheMix\event\ThePlayerQuitEvent;
 
 class TheMix extends PluginBase
 {
@@ -27,16 +31,21 @@ public function onLoad()
     public function onEnable()
     {
         $this->registerCommands();
-        $this->getLogger()->notice(TextFormat::GREEN . "
+        $this->registerEvents();
+        $this->getLogger()->notice(TextFormat::AQUA . '
 
-████████╗██╗  ██╗███████╗    ███╗   ███╗██╗██╗  ██╗
-╚══██╔══╝██║  ██║██╔════╝    ████╗ ████║██║╚██╗██╔╝
-   ██║   ███████║█████╗      ██╔████╔██║██║ ╚███╔╝ 
-   ██║   ██╔══██║██╔══╝      ██║╚██╔╝██║██║ ██╔██╗ 
-   ██║   ██║  ██║███████╗    ██║ ╚═╝ ██║██║██╔╝ ██╗
-   ╚═╝   ╚═╝  ╚═╝╚══════╝    ╚═╝     ╚═╝╚═╝╚═╝  ╚═╝
 
-        ");
+        ███        ▄█    █▄       ▄████████        ▄▄▄▄███▄▄▄▄    ▄█  ▀████    ▐████▀ 
+    ▀█████████▄   ███    ███     ███    ███      ▄██▀▀▀███▀▀▀██▄ ███    ███▌   ████▀  
+       ▀███▀▀██   ███    ███     ███    █▀       ███   ███   ███ ███▌    ███  ▐███    
+        ███   ▀  ▄███▄▄▄▄███▄▄  ▄███▄▄▄          ███   ███   ███ ███▌    ▀███▄███▀    
+        ███     ▀▀███▀▀▀▀███▀  ▀▀███▀▀▀          ███   ███   ███ ███▌    ████▀██▄     
+        ███       ███    ███     ███    █▄       ███   ███   ███ ███    ▐███  ▀███    
+        ███       ███    ███     ███    ███      ███   ███   ███ ███   ▄███     ███▄  
+       ▄████▀     ███    █▀      ██████████       ▀█   ███   █▀  █▀   ████       ███▄ 
+
+
+        ');
     }
 
     public function onDisable()
@@ -52,19 +61,20 @@ public static function getInstance(): TheMix
         return self::$instance;
     }
 
-    /**
-     * @return DataBase
-     */
-    public static function getDataBase(): DataBase
-    {
-        return new DataBase();
-    }
-
     private function registerCommands(): void
     {
         $commands = [
-            new PingCommand($this)
+            new PingCommand($this),
+            new TpsCommand($this)
         ];
         $this->getServer()->getCommandMap()->registerAll($this->getName(), $commands);
     }
+
+    private function registerEvents(): void
+    {
+        $plm = $this->getServer()->getPluginManager();
+        $plm->registerEvents(new ThePlayerLoginEvent(), $this);
+        $plm->registerEvents(new ThePlayerJoinEvent(), $this);
+        $plm->registerEvents(new ThePlayerQuitEvent(), $this);
+    }
 }

src/VectorNetworkProject/TheMix/TheMix.php

@@ -0,0 +1,30 @@
+<?php
+/**
+ * Copyright (c) 2018 VectorNetworkProject. All rights reserved. MIT license.
+ *
+ * GitHub: https://github.com/VectorNetworkProject/TheMix
+ * Website: https://www.vector-network.tk
+ */
+
+namespace VectorNetworkProject\TheMix\event;
+
+
+use pocketmine\event\Listener;
+use pocketmine\event\player\PlayerJoinEvent;
+use Miste\scoreboardspe\API\{
+    Scoreboard, ScoreboardDisplaySlot, ScoreboardSort, ScoreboardAction
+};
+use VectorNetworkProject\TheMix\task\UpdateScoreboardTask;
+use VectorNetworkProject\TheMix\TheMix;
+
+class ThePlayerJoinEvent implements Listener
+{
+    public function event(PlayerJoinEvent $event)
+    {
+        $player = $event->getPlayer();
+        $scoreboard = new Scoreboard(TheMix::getInstance()->getServer()->getPluginManager()->getPlugin("ScoreboardsPE")->getPlugin(), "§l§7=== §6THE §aM§cI§eX §7===", ScoreboardAction::CREATE);
+        $scoreboard->create(ScoreboardDisplaySlot::SIDEBAR, ScoreboardSort::DESCENDING);
+        $scoreboard->addDisplay($player);
+        TheMix::getInstance()->getScheduler()->scheduleRepeatingTask(new UpdateScoreboardTask($scoreboard, $player), 20);
+    }
+}

src/VectorNetworkProject/TheMix/event/ThePlayerJoinEvent.php

@@ -0,0 +1,25 @@
+<?php
+/**
+ * Copyright (c) 2018 VectorNetworkProject. All rights reserved. MIT license.
+ *
+ * GitHub: https://github.com/VectorNetworkProject/TheMix
+ * Website: https://www.vector-network.tk
+ */
+
+namespace VectorNetworkProject\TheMix\event;
+
+
+use pocketmine\event\Listener;
+use pocketmine\event\player\PlayerLoginEvent;
+use VectorNetworkProject\TheMix\provider\DataFile;
+use VectorNetworkProject\TheMix\provider\JSON;
+
+class ThePlayerLoginEvent implements Listener
+{
+    public function event(PlayerLoginEvent $event)
+    {
+        $player = $event->getPlayer();
+        $db = new JSON($player->getXuid(), DataFile::PLAYER_LEVEL);
+        $db->init();
+    }
+}

src/VectorNetworkProject/TheMix/event/ThePlayerLoginEvent.php

@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright (c) 2018 VectorNetworkProject. All rights reserved. MIT license.
+ *
+ * GitHub: https://github.com/VectorNetworkProject/TheMix
+ * Website: https://www.vector-network.tk
+ */
+
+namespace VectorNetworkProject\TheMix\event;
+
+
+use pocketmine\event\Listener;
+use pocketmine\event\player\PlayerQuitEvent;
+
+class ThePlayerQuitEvent implements Listener
+{
+    public function event(PlayerQuitEvent $event)
+    {
+        $player = $event->getPlayer();
+    }
+}

src/VectorNetworkProject/TheMix/event/ThePlayerQuitEvent.php

@@ -13,61 +13,6 @@
 
 abstract class Provider
 {
-    public function createTable()
-    {
-        throw new \Error("Missing method 'createTable'");
-    }
-
-    public function deleteTable()
-    {
-        throw new \Error("Missing method 'deleteTable'");
-    }
-
-    public function hasTable()
-    {
-        throw new \Error("Missing method 'hasTable'");
-    }
-
-    public function create()
-    {
-        throw new \Error("Missing method 'create'");
-    }
-
-    public function delete()
-    {
-        throw new \Error("Missing method 'delete'");
-    }
-
-    public function has()
-    {
-        throw new \Error("Missing method 'has'");
-    }
-
-    public function set()
-    {
-        throw new \Error("Missing method 'set'");
-    }
-
-    public function remove()
-    {
-        throw new \Error("Missing method 'remove'");
-    }
-
-    public function get()
-    {
-        throw new \Error("Missing method 'get'");
-    }
-
-    public function getAll()
-    {
-        throw new \Error("Missing method 'getAll'");
-    }
-
-    public function getKeys()
-    {
-        throw new \Error("Missing method 'getKeys'");
-    }
-
     protected static function getPath(string $folder, string $type): string
     {
         return TheMix::getInstance()->getDataFolder() . '/' . $folder . '/' . $type . '/';

src/VectorNetworkProject/TheMix/lib/database/Provider.php

@@ -0,0 +1,15 @@
+<?php
+/**
+ * Copyright (c) 2018 VectorNetworkProject. All rights reserved. MIT license.
+ *
+ * GitHub: https://github.com/VectorNetworkProject/TheMix
+ * Website: https://www.vector-network.tk
+ */
+
+namespace VectorNetworkProject\TheMix\provider;
+
+
+interface DataFile
+{
+    public const PLAYER_LEVEL = 'Level';
+}

src/VectorNetworkProject/TheMix/provider/DataFile.php

@@ -10,6 +10,7 @@
 
 
 use pocketmine\utils\Config;
+use pocketmine\utils\MainLogger;
 use VectorNetworkProject\TheMix\lib\database\Provider;
 
 class JSON extends Provider
@@ -31,15 +32,21 @@ public function __construct(string $xuid, string $file)
         $this->file = $file . '.json';
     }
 
+    public function init(array $data = []): void
+    {
+        if (!$this->hasTable()) $this->createTable($data);
+    }
+
     /**
      * @param array $table
      * @return void
      */
     public function createTable(array $table = []): void
     {
-        @mkdir($this->path);
+        @mkdir($this->path, 0755, true);
         $config = new Config($this->path . $this->file, Config::JSON, $table);
         $config->save();
+        MainLogger::getLogger()->debug("[PROVIDER] Create ".$this->file);
     }
 
     /**
@@ -53,13 +60,11 @@ public function hasTable(): bool
     }
 
     /**
-     * @return bool
+     * @return void
      */
-    public function deleteTable(): bool
+    public function deleteTable(): void
     {
-        return unlink($this->path . $this->file)
-            ? true
-            : false;
+        unlink($this->path . $this->file);
     }
 
     /**
@@ -105,7 +110,7 @@ public function getKeys(): array
      * @param string $key
      * @return bool
      */
-    public function has(string $key): bool
+    public function exists(string $key): bool
     {
         $config = new Config($this->path . $this->file, Config::JSON);
         return $config->exists($key)

src/VectorNetworkProject/TheMix/provider/JSON.php

@@ -104,7 +104,7 @@ public function getKeys(): array
      * @param string $key
      * @return bool
      */
-    public function has(string $key): bool
+    public function exists(string $key): bool
     {
         $config = new Config($this->path . $this->file, Config::YAML);
         return $config->exists($key)