Merge branch 'master' into develop

Author: InkoHX

plugin.yml

@@ -11,4 +11,10 @@ authors:
 - MazaiCrafty
 - yuko fuyutsuki
 - DusKong
-- UramnOIL
+- UramnOIL
+
+permissions:
+  the.mix.command.ping:
+    default: true
+  the.mix.command.tps:
+    default: true

src/VectorNetworkProject/TheMix/DataBase.php

@@ -0,0 +1,34 @@
+<?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;
+
+
+use VectorNetworkProject\TheMix\provider\JSON;
+use VectorNetworkProject\TheMix\provider\YAML;
+
+class DataBase
+{
+    /**
+     * @param string $xuid
+     * @param string $file
+     * @return JSON
+     */
+    public static function JsonUserSetting(string $xuid, $file = "UserDatas"): JSON
+    {
+        return new JSON($xuid, $file);
+    }
+
+    /**
+     * @return YAML
+     */
+    public static function YamlClientSetting(): YAML
+    {
+        return new YAML();
+    }
+}

src/VectorNetworkProject/TheMix/TheMix.php

@@ -10,6 +10,7 @@
 
 
 use pocketmine\plugin\PluginBase;
+use VectorNetworkProject\TheMix\command\PingCommand;
 
 class TheMix extends PluginBase
 {
@@ -24,6 +25,7 @@ public function onLoad()
 
     public function onEnable()
     {
+        $this->registerCommands();
         $this->getLogger()->notice("Loaded System!!");
     }
 
@@ -32,8 +34,27 @@ public function onDisable()
         $this->getLogger()->notice("Unload System...");
     }
 
+    /**
+     * @return TheMix
+     */
     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)
+        ];
+        $this->getServer()->getCommandMap()->registerAll($this->getName(), $commands);
+    }
 }

src/VectorNetworkProject/TheMix/command/PingCommand.php

@@ -0,0 +1,36 @@
+<?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\command;
+
+
+use pocketmine\command\CommandSender;
+use pocketmine\command\PluginCommand;
+use pocketmine\Player;
+use pocketmine\plugin\Plugin;
+use pocketmine\utils\TextFormat;
+
+class PingCommand extends PluginCommand
+{
+    public function __construct(Plugin $owner)
+    {
+        parent::__construct('ping', $owner);
+        $this->setDescription('応答速度を計測します。');
+        $this->setPermission('the.mix.command.ping');
+    }
+
+    public function execute(CommandSender $sender, string $commandLabel, array $args): bool
+    {
+        if (!$sender instanceof Player) {
+            $sender->sendMessage(TextFormat::RED . "このコマンドはプレイヤーのみ実行可能です。");
+            return true;
+        }
+        $sender->sendMessage(TextFormat::RED . $sender->getPing() . TextFormat::YELLOW . "ms");
+        return true;
+    }
+}

src/VectorNetworkProject/TheMix/command/TpsCommand.php

@@ -0,0 +1,32 @@
+<?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\command;
+
+
+use pocketmine\command\CommandSender;
+use pocketmine\command\PluginCommand;
+use pocketmine\plugin\Plugin;
+use pocketmine\Server;
+use pocketmine\utils\TextFormat;
+
+class TpsCommand extends PluginCommand
+{
+    public function __construct(Plugin $owner)
+    {
+        parent::__construct('tps', $owner);
+        $this->setPermission('the.mix.command.tps');
+        $this->setDescription('TicksPerSecond');
+    }
+
+    public function execute(CommandSender $sender, string $commandLabel, array $args): bool
+    {
+        $sender->sendMessage(TextFormat::GREEN . 'TPS: ' . Server::getInstance()->getTicksPerSecond() . '/20');
+        return true;
+    }
+}

src/VectorNetworkProject/TheMix/provider/JSON.php

@@ -75,7 +75,7 @@ public function set(string $key, $data): void
 
     /**
      * @param string $key
-     * @return mixed
+     * @return bool|mixed
      */
     public function get(string $key)
     {