Merge pull request #4 from VectorNetworkProject/develop

Release v0.0.5

Author: InkoHX

.idea/encodings.xml

@@ -5,4 +5,7 @@ branches:
 projects:
   TheMix:
     path: ""
+    libs:
+      - src: fuyutsuki/libform/libform
+        version: 0.4.0
 ...

.poggit.yml

@@ -18,5 +18,13 @@
 [![StyleCI](https://github.styleci.io/repos/157084851/shield?branch=master)](https://github.styleci.io/repos/157084851)
 
 # The Mix
-Original game of VectorNetwork
+VectorNetworkの新しいゲームプラグイン！  
+あなたは簡単な作業をするだけでゲームを遊ぶ事が出来る！
+
+# DEVirion
+プラグインをスムーズに開発する為に[DEVirion](https://github.com/poggit/devirion)を使用しています。  
+以下のライブラリを使用しています。
+
+[libform](https://github.com/fuyutsuki/libform) - yuko fuyutsuki
+
 </div>

.vscode/settings.json

@@ -13,9 +13,3 @@ authors:
 - yuko fuyutsuki
 - DusKong
 - UramnOIL
-
-permissions:
-  the.mix.command.ping:
-    default: true
-  the.mix.command.tps:
-    default: true

README.md

@@ -10,38 +10,52 @@
 
 use pocketmine\plugin\PluginBase;
 use pocketmine\utils\TextFormat;
-use VectorNetworkProject\TheMix\command\PingCommand;
-use VectorNetworkProject\TheMix\command\TpsCommand;
+use tokyo\pmmp\libform\FormApi;
+use VectorNetworkProject\TheMix\command\defaults\ModeratorCommand;
+use VectorNetworkProject\TheMix\command\defaults\PingCommand;
+use VectorNetworkProject\TheMix\command\defaults\TpsCommand;
+use VectorNetworkProject\TheMix\command\Permissions;
+use VectorNetworkProject\TheMix\event\TheBlockBreakEvent;
+use VectorNetworkProject\TheMix\event\TheBlockPlaceEvent;
 use VectorNetworkProject\TheMix\event\ThePlayerJoinEvent;
 use VectorNetworkProject\TheMix\event\ThePlayerLoginEvent;
 use VectorNetworkProject\TheMix\event\ThePlayerQuitEvent;
+use VectorNetworkProject\TheMix\game\DefaultConfig;
 
 class TheMix extends PluginBase
 {
     /* @var TheMix $instance */
     private static $instance = null;
 
+    public const PLUGIN_CONFIG_VERSION = 1;
+
     public function onLoad()
     {
         self::$instance = $this;
+        DefaultConfig::init();
         $this->getLogger()->notice('Loading System...');
     }
 
     public function onEnable()
     {
+        Permissions::registerPermissions();
+        FormApi::register($this);
         $this->registerCommands();
         $this->registerEvents();
+        $this->getServer()->loadLevel(DefaultConfig::getStageLevelName())
+            ? $this->getLogger()->notice('Loaded stage.')
+            : $this->getServer()->generateLevel(DefaultConfig::getStageLevelName());
         $this->getLogger()->notice(TextFormat::AQUA.'
 
 
-        ███        ▄█    █▄       ▄████████        ▄▄▄▄███▄▄▄▄    ▄█  ▀████    ▐████▀ 
-    ▀█████████▄   ███    ███     ███    ███      ▄██▀▀▀███▀▀▀██▄ ███    ███▌   ████▀  
-       ▀███▀▀██   ███    ███     ███    █▀       ███   ███   ███ ███▌    ███  ▐███    
-        ███   ▀  ▄███▄▄▄▄███▄▄  ▄███▄▄▄          ███   ███   ███ ███▌    ▀███▄███▀    
-        ███     ▀▀███▀▀▀▀███▀  ▀▀███▀▀▀          ███   ███   ███ ███▌    ████▀██▄     
-        ███       ███    ███     ███    █▄       ███   ███   ███ ███    ▐███  ▀███    
-        ███       ███    ███     ███    ███      ███   ███   ███ ███   ▄███     ███▄  
-       ▄████▀     ███    █▀      ██████████       ▀█   ███   █▀  █▀   ████       ███▄ 
+        ███        ▄█    █▄       ▄████████        ▄▄▄▄███▄▄▄▄    ▄█  ▀████    ▐████▀
+    ▀█████████▄   ███    ███     ███    ███      ▄██▀▀▀███▀▀▀██▄ ███    ███▌   ████▀
+       ▀███▀▀██   ███    ███     ███    █▀       ███   ███   ███ ███▌    ███  ▐███
+        ███   ▀  ▄███▄▄▄▄███▄▄  ▄███▄▄▄          ███   ███   ███ ███▌    ▀███▄███▀
+        ███     ▀▀███▀▀▀▀███▀  ▀▀███▀▀▀          ███   ███   ███ ███▌    ████▀██▄
+        ███       ███    ███     ███    █▄       ███   ███   ███ ███    ▐███  ▀███
+        ███       ███    ███     ███    ███      ███   ███   ███ ███   ▄███     ███▄
+       ▄████▀     ███    █▀      ██████████       ▀█   ███   █▀  █▀   ████       ███▄
 
 
         ');
@@ -65,6 +79,7 @@ private function registerCommands(): void
         $commands = [
             new PingCommand($this),
             new TpsCommand($this),
+            new ModeratorCommand($this),
         ];
         $this->getServer()->getCommandMap()->registerAll($this->getName(), $commands);
     }
@@ -75,5 +90,7 @@ private function registerEvents(): void
         $plm->registerEvents(new ThePlayerLoginEvent(), $this);
         $plm->registerEvents(new ThePlayerJoinEvent(), $this);
         $plm->registerEvents(new ThePlayerQuitEvent(), $this);
+        $plm->registerEvents(new TheBlockBreakEvent(), $this);
+        $plm->registerEvents(new TheBlockPlaceEvent(), $this);
     }
 }

plugin.yml

@@ -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\command;
+
+use pocketmine\permission\Permission;
+use pocketmine\permission\PermissionManager;
+
+class Permissions
+{
+    public const USER = 'the.mix.commands.user.';
+    public const ADMIN = 'the.mix.commands.admin.';
+
+    public static function registerPermissions(): void
+    {
+        PermissionManager::getInstance()->addPermission(new Permission(self::USER.'ping', '応答速度を計測します。', Permission::DEFAULT_TRUE));
+        PermissionManager::getInstance()->addPermission(new Permission(self::USER.'tps', 'TicksPerSecond', Permission::DEFAULT_TRUE));
+        PermissionManager::getInstance()->addPermission(new Permission(self::ADMIN.'moderator', 'ModeratorTools', Permission::DEFAULT_OP));
+    }
+}

src/VectorNetworkProject/TheMix/TheMix.php

@@ -0,0 +1,99 @@
+<?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\defaults;
+
+use pocketmine\command\CommandSender;
+use pocketmine\command\PluginCommand;
+use pocketmine\level\Position;
+use pocketmine\Player;
+use pocketmine\plugin\Plugin;
+use pocketmine\Server;
+use pocketmine\utils\TextFormat;
+use tokyo\pmmp\libform\element\Button;
+use tokyo\pmmp\libform\FormApi;
+use VectorNetworkProject\TheMix\command\Permissions;
+use VectorNetworkProject\TheMix\game\DefaultConfig;
+
+class ModeratorCommand extends PluginCommand
+{
+    /**
+     * ModeratorCommand constructor.
+     *
+     * @param Plugin $owner
+     */
+    public function __construct(Plugin $owner)
+    {
+        parent::__construct('moderator', $owner);
+        $this->setDescription('モデレーター専用メニュー(管理権限持ちのユーザー以外使用不可能)');
+        $this->setPermission(Permissions::ADMIN.'moderator');
+    }
+
+    /**
+     * @param CommandSender $sender
+     * @param string        $commandLabel
+     * @param array         $args
+     *
+     * @return bool|mixed
+     */
+    public function execute(CommandSender $sender, string $commandLabel, array $args)
+    {
+        if (!$this->testPermission($sender)) {
+            return true;
+        }
+        $sender instanceof Player
+            ? self::sendModeratorUI($sender)
+            : $sender->sendMessage(TextFormat::RED.'プレイヤーのみ実行可能です。');
+
+        return true;
+    }
+
+    public static function sendModeratorUI(Player $player): void
+    {
+        $form = FormApi::makeListForm(function (Player $player, ?int $data) {
+            if (FormApi::formCancelled($data)) {
+                return;
+            }
+            switch ($data) {
+                case 0:
+                    self::sendLevelManagerUI($player);
+                    break;
+            }
+        });
+        $form->setTitle('Moderator Menu');
+        $form->setContent('行う処理を選んで下さい。');
+        $form->addButton(new Button('テレポート'));
+        $form->sendToPlayer($player);
+    }
+
+    public static function sendLevelManagerUI(Player $player): void
+    {
+        $form = FormApi::makeListForm(function (Player $player, ?int $data) {
+            if (FormApi::formCancelled($data)) {
+                return;
+            }
+            switch ($data) {
+                case 0:
+                    $player->teleport(Server::getInstance()->getDefaultLevel()->getSpawnLocation());
+                    break;
+                case 1:
+                    $player->teleport(new Position(256, 5, 256, Server::getInstance()->getLevelByName(DefaultConfig::getStageLevelName())));
+                    break;
+                case 2:
+                    self::sendModeratorUI($player);
+                    break;
+            }
+        });
+        $form->setTitle('WorldManager');
+        $form->setContent('テレポートするワールドを選択して下さい。');
+        $form->addButton(new Button('lobby(default world)'));
+        $form->addButton(new Button('Stage'));
+        $form->addButton(new Button('戻る'));
+        $form->sendToPlayer($player);
+    }
+}

src/VectorNetworkProject/TheMix/command/Permissions.php

@@ -6,13 +6,14 @@
  * Website: https://www.vector-network.tk
  */
 
-namespace VectorNetworkProject\TheMix\command;
+namespace VectorNetworkProject\TheMix\command\defaults;
 
 use pocketmine\command\CommandSender;
 use pocketmine\command\PluginCommand;
 use pocketmine\Player;
 use pocketmine\plugin\Plugin;
 use pocketmine\utils\TextFormat;
+use VectorNetworkProject\TheMix\command\Permissions;
 
 class PingCommand extends PluginCommand
 {
@@ -25,17 +26,17 @@ public function __construct(Plugin $owner)
     {
         parent::__construct('ping', $owner);
         $this->setDescription('応答速度を計測します。');
-        $this->setPermission('the.mix.command.ping');
+        $this->setPermission(Permissions::USER.'ping');
     }
 
     /**
      * @param CommandSender $sender
      * @param string        $commandLabel
      * @param array         $args
      *
-     * @return bool
+     * @return mixed
      */
-    public function execute(CommandSender $sender, string $commandLabel, array $args): bool
+    public function execute(CommandSender $sender, string $commandLabel, array $args)
     {
         if (!$sender instanceof Player) {
             $sender->sendMessage(TextFormat::RED.'このコマンドはプレイヤーのみ実行可能です。');

src/VectorNetworkProject/TheMix/command/defaults/ModeratorCommand.php

@@ -6,13 +6,14 @@
  * Website: https://www.vector-network.tk
  */
 
-namespace VectorNetworkProject\TheMix\command;
+namespace VectorNetworkProject\TheMix\command\defaults;
 
 use pocketmine\command\CommandSender;
 use pocketmine\command\PluginCommand;
 use pocketmine\plugin\Plugin;
 use pocketmine\Server;
 use pocketmine\utils\TextFormat;
+use VectorNetworkProject\TheMix\command\Permissions;
 
 class TpsCommand extends PluginCommand
 {
@@ -24,7 +25,7 @@ class TpsCommand extends PluginCommand
     public function __construct(Plugin $owner)
     {
         parent::__construct('tps', $owner);
-        $this->setPermission('the.mix.command.tps');
+        $this->setPermission(Permissions::USER.'tps');
         $this->setDescription('TicksPerSecond');
     }
 
@@ -33,9 +34,9 @@ public function __construct(Plugin $owner)
      * @param string        $commandLabel
      * @param array         $args
      *
-     * @return bool
+     * @return mixed
      */
-    public function execute(CommandSender $sender, string $commandLabel, array $args): bool
+    public function execute(CommandSender $sender, string $commandLabel, array $args)
     {
         $sender->sendMessage(TextFormat::GREEN.'TPS: '.Server::getInstance()->getTicksPerSecond().'/20');