mcbe 1.8.0に対応

InkoHX · InkoHX · commit 2ad8b5900260 · 2018-12-13T23:27:21.000+09:00
diff --git a/.poggit.yml b/.poggit.yml
@@ -9,7 +9,7 @@ projects:
       - src: fuyutsuki/libform/libform
         version: 0.4.0
       - src: InkoHX/LeveLibrary/LeveLibrary
-        version: 0.0.3
+        version: 0.0.4
       - src: InkoHX/GoldLibrary/GoldLibrary
-        version: 0.0.2
+        version: 0.0.3
 ...
diff --git a/composer.json b/composer.json
@@ -49,7 +49,7 @@
     "ext-zip": "*",
     "ext-zlib": ">=1.2.11",
     "mdanter/ecc": "^0.5.0",
-    "pocketmine/pocketmine-mp": "^3.4.0",
+    "pocketmine/pocketmine-mp": "^3.5.0",
     "pocketmine/raklib": "^0.12.0",
     "pocketmine/spl": "^0.3.0",
     "pocketmine/binaryutils": "^0.1.0",
diff --git a/composer.lock b/composer.lock
diff --git a/resources/config.yml b/resources/config.yml
@@ -3,6 +3,8 @@ dev-mode: true
 stage-world-name: stage
 event-time: 30
 timezone: Asia/Tokyo
+join-block-id: 
+
 red:
   spawn1:
     x: 1
diff --git a/src/VectorNetworkProject/TheMix/command/Permissions.php b/src/VectorNetworkProject/TheMix/command/Permissions.php
@@ -16,6 +16,9 @@ class Permissions
     public const USER = 'the.mix.commands.user.';
     public const ADMIN = 'the.mix.commands.admin.';
 
+    /**
+     * @return void
+     */
     public static function registerPermissions(): void
     {
         PermissionManager::getInstance()->addPermission(new Permission(self::USER.'ping', '応答速度を計測します。', Permission::DEFAULT_TRUE));
diff --git a/src/VectorNetworkProject/TheMix/command/defaults/DiscordCommand.php b/src/VectorNetworkProject/TheMix/command/defaults/DiscordCommand.php
@@ -36,7 +36,7 @@ public function __construct(Plugin $owner)
      */
     public function execute(CommandSender $sender, string $commandLabel, array $args)
     {
-        $sender->sendMessage('Discord: https://discord.gg/EF2G5dh');
+        $sender->sendMessage('§9Discord: https://discord.gg/EF2G5dh');
 
         return true;
     }
diff --git a/src/VectorNetworkProject/TheMix/event/block/BlockReGeneratorEvent.php b/src/VectorNetworkProject/TheMix/event/block/BlockReGeneratorEvent.php
@@ -19,6 +19,9 @@
 
 class BlockReGeneratorEvent implements Listener
 {
+    /**
+     * @param BlockBreakEvent $event
+     */
     public function event(BlockBreakEvent $event): void
     {
         $block = $event->getBlock();
diff --git a/src/VectorNetworkProject/TheMix/event/block/TheBlockBreakEvent.php b/src/VectorNetworkProject/TheMix/event/block/TheBlockBreakEvent.php
@@ -24,6 +24,10 @@
 
 class TheBlockBreakEvent implements Listener
 {
+    /**
+     * @param BlockBreakEvent $event
+     * @throws \ReflectionException
+     */
     public function event(BlockBreakEvent $event)
     {
         $player = $event->getPlayer();
@@ -58,7 +62,7 @@ public function event(BlockBreakEvent $event)
                 Server::getInstance()->getLogger()->info("{$player->getNameTag()}§fが§cRED§fのコアを破壊している！");
                 $block->getLevel()->broadcastLevelSoundEvent($block->asVector3(), LevelSoundEventPacket::SOUND_RANDOM_ANVIL_USE);
                 foreach (Server::getInstance()->getOnlinePlayers() as $player) {
-                    LevelSounds::NotePiano($player, 20);
+                    LevelSounds::NotePiano($player);
                 }
             } elseif (BlueCoreManager::isCore($block)) {
                 $event->setCancelled();
@@ -78,7 +82,7 @@ public function event(BlockBreakEvent $event)
                 Server::getInstance()->getLogger()->info("{$player->getNameTag()}§fが§cRED§fのコアを破壊している！");
                 $block->getLevel()->broadcastLevelSoundEvent($block->asVector3(), LevelSoundEventPacket::SOUND_RANDOM_ANVIL_USE);
                 foreach (Server::getInstance()->getOnlinePlayers() as $player) {
-                    LevelSounds::NotePiano($player, 20);
+                    LevelSounds::NotePiano($player);
                 }
             }
         }
diff --git a/src/VectorNetworkProject/TheMix/event/block/TheBlockPlaceEvent.php b/src/VectorNetworkProject/TheMix/event/block/TheBlockPlaceEvent.php
@@ -16,6 +16,9 @@
 
 class TheBlockPlaceEvent implements Listener
 {
+    /**
+     * @param BlockPlaceEvent $event
+     */
     public function event(BlockPlaceEvent $event)
     {
         $player = $event->getPlayer();
diff --git a/src/VectorNetworkProject/TheMix/event/entity/TheEntityDamageEvent.php b/src/VectorNetworkProject/TheMix/event/entity/TheEntityDamageEvent.php
@@ -24,6 +24,10 @@
 
 class TheEntityDamageEvent implements Listener
 {
+    /**
+     * @param EntityDamageEvent $event
+     * @throws \ReflectionException
+     */
     public function event(EntityDamageEvent $event)
     {
         $entity = $event->getEntity();
diff --git a/src/VectorNetworkProject/TheMix/event/game/TheEndGameEvent.php b/src/VectorNetworkProject/TheMix/event/game/TheEndGameEvent.php
@@ -24,6 +24,9 @@ class TheEndGameEvent implements Listener
     /** @var bool $finish */
     private static $finish = false;
 
+    /**
+     * @param GameWinEvent $event
+     */
     public function event(GameWinEvent $event)
     {
         if (DefaultConfig::isDev()) {
diff --git a/src/VectorNetworkProject/TheMix/event/game/ThePlayerStreakEvent.php b/src/VectorNetworkProject/TheMix/event/game/ThePlayerStreakEvent.php
@@ -15,25 +15,23 @@
 
 class ThePlayerStreakEvent implements Listener
 {
+    /**
+     * @param PlayerStreakEvent $event
+     */
     public function event(PlayerStreakEvent $event)
     {
         $player = $event->getPlayer();
         switch ($event->getCount()) {
             case 5:
-                $this->getStreakMessage($player, $event->getCount());
-                break;
             case 10:
-                $this->getStreakMessage($player, $event->getCount());
-                break;
             case 20:
-                $this->getStreakMessage($player, $event->getCount());
-                break;
             case 30:
-                $this->getStreakMessage($player, $event->getCount());
-                break;
+            case 40:
             case 50:
-                $this->getStreakMessage($player, $event->getCount());
-                break;
+            case 60:
+            case 70:
+            case 80:
+            case 90:
             case 100:
                 $this->getStreakMessage($player, $event->getCount());
                 break;
diff --git a/src/VectorNetworkProject/TheMix/event/gold/ThePlayerAddGoldEvent.php b/src/VectorNetworkProject/TheMix/event/gold/ThePlayerAddGoldEvent.php
@@ -13,6 +13,9 @@
 
 class ThePlayerAddGoldEvent implements Listener
 {
+    /**
+     * @param PlayerAddGoldEvent $event
+     */
     public function event(PlayerAddGoldEvent $event)
     {
         $event->getPlayer()->sendMessage("§6{$event->getGold()}g §fを手に入れた。");
diff --git a/src/VectorNetworkProject/TheMix/event/level/TheItemSpawnEvent.php b/src/VectorNetworkProject/TheMix/event/level/TheItemSpawnEvent.php
@@ -15,6 +15,9 @@
 
 class TheItemSpawnEvent implements Listener
 {
+    /**
+     * @param ItemSpawnEvent $event
+     */
     public function event(ItemSpawnEvent $event)
     {
         if (DefaultConfig::isDev()) {
diff --git a/src/VectorNetworkProject/TheMix/event/level/TheLevelUpEvent.php b/src/VectorNetworkProject/TheMix/event/level/TheLevelUpEvent.php
@@ -13,6 +13,9 @@
 
 class TheLevelUpEvent implements Listener
 {
+    /**
+     * @param PlayerLevelUpEvent $event
+     */
     public function event(PlayerLevelUpEvent $event)
     {
         $player = $event->getPlayer();
diff --git a/src/VectorNetworkProject/TheMix/event/level/ThePlayerAddXpEvent.php b/src/VectorNetworkProject/TheMix/event/level/ThePlayerAddXpEvent.php
@@ -13,6 +13,9 @@
 
 class ThePlayerAddXpEvent implements Listener
 {
+    /**
+     * @param PlayerAddXpEvent $event
+     */
     public function event(PlayerAddXpEvent $event)
     {
         $event->getPlayer()->sendMessage("§b{$event->getXp()}XP §fを手に入れた");
diff --git a/src/VectorNetworkProject/TheMix/event/player/ThePlayerInteractEvent.php b/src/VectorNetworkProject/TheMix/event/player/ThePlayerInteractEvent.php
@@ -16,6 +16,9 @@
 
 class ThePlayerInteractEvent implements Listener
 {
+    /**
+     * @param PlayerInteractEvent $event
+     */
     public function event(PlayerInteractEvent $event)
     {
         $player = $event->getPlayer();
diff --git a/src/VectorNetworkProject/TheMix/event/player/ThePlayerJoinEvent.php b/src/VectorNetworkProject/TheMix/event/player/ThePlayerJoinEvent.php
@@ -22,6 +22,9 @@
 
 class ThePlayerJoinEvent implements Listener
 {
+    /**
+     * @param PlayerJoinEvent $event
+     */
     public function event(PlayerJoinEvent $event)
     {
         $player = $event->getPlayer();
diff --git a/src/VectorNetworkProject/TheMix/event/player/ThePlayerLoginEvent.php b/src/VectorNetworkProject/TheMix/event/player/ThePlayerLoginEvent.php
@@ -15,6 +15,9 @@
 
 class ThePlayerLoginEvent implements Listener
 {
+    /**
+     * @param PlayerLoginEvent $event
+     */
     public function event(PlayerLoginEvent $event)
     {
         $player = $event->getPlayer();
diff --git a/src/VectorNetworkProject/TheMix/event/player/ThePlayerQuitEvent.php b/src/VectorNetworkProject/TheMix/event/player/ThePlayerQuitEvent.php
@@ -16,6 +16,9 @@
 
 class ThePlayerQuitEvent implements Listener
 {
+    /**
+     * @param PlayerQuitEvent $event
+     */
     public function event(PlayerQuitEvent $event)
     {
         $player = $event->getPlayer();
diff --git a/src/VectorNetworkProject/TheMix/game/corepvp/SpawnManager.php b/src/VectorNetworkProject/TheMix/game/corepvp/SpawnManager.php
@@ -25,6 +25,9 @@
 
 class SpawnManager
 {
+    /**
+     * @param Player $player
+     */
     public static function PlayerReSpawn(Player $player)
     {
         if (RedTeamManager::isJoined($player)) {
@@ -38,6 +41,10 @@ public static function PlayerReSpawn(Player $player)
         }
     }
 
+    /**
+     * @param Player $player
+     * @param Position $position
+     */
     private static function ReSpawnCooldown(Player $player, Position $position): void
     {
         $player->addTitle('§l§cYOU DIED', 'あなたは死んでしまった！5秒後行動可能になります。', 20, 100, 20);
diff --git a/src/VectorNetworkProject/TheMix/game/corepvp/TeamManager.php b/src/VectorNetworkProject/TheMix/game/corepvp/TeamManager.php
@@ -18,6 +18,9 @@
 
 abstract class TeamManager
 {
+    /**
+     * @param Player $player
+     */
     public static function JoinTeam(Player $player)
     {
         if (BlueTeamManager::isJoined($player) || RedTeamManager::isJoined($player)) {
@@ -40,11 +43,24 @@ public static function JoinTeam(Player $player)
         }
     }
 
+    /**
+     * @param Player $player
+     */
     abstract public static function addList(Player $player): void;
 
+    /**
+     * @param Player $player
+     */
     abstract public static function removeList(Player $player): void;
 
+    /**
+     * @param Player $player
+     * @return bool
+     */
     abstract public static function isJoined(Player $player): bool;
 
+    /**
+     * @return array
+     */
     abstract public static function getList(): array;
 }
diff --git a/src/VectorNetworkProject/TheMix/game/corepvp/blue/BlueTeamManager.php b/src/VectorNetworkProject/TheMix/game/corepvp/blue/BlueTeamManager.php
@@ -23,28 +23,44 @@ public static function addList(Player $player): void
         }
     }
 
+    /**
+     * @param Player $player
+     */
     public static function removeList(Player $player): void
     {
         if (self::isJoined($player)) {
             unset(self::$list[$player->getName()]);
         }
     }
 
+    /**
+     * @param Player $player
+     * @return bool
+     */
     public static function isJoined(Player $player): bool
     {
         return isset(self::$list[$player->getName()]) ? true : false;
     }
 
+    /**
+     * @return array
+     */
     public static function getList(): array
     {
         return self::$list;
     }
 
+    /**
+     * @return int
+     */
     public static function getListCount(): int
     {
         return count(self::$list);
     }
 
+    /**
+     *
+     */
     public static function ClearList(): void
     {
         self::$list = [];
diff --git a/src/VectorNetworkProject/TheMix/game/corepvp/red/RedTeamManager.php b/src/VectorNetworkProject/TheMix/game/corepvp/red/RedTeamManager.php
diff --git a/src/VectorNetworkProject/TheMix/game/event/player/PlayerStreakEvent.php b/src/VectorNetworkProject/TheMix/game/event/player/PlayerStreakEvent.php
diff --git a/src/VectorNetworkProject/TheMix/game/item/ItemManager.php b/src/VectorNetworkProject/TheMix/game/item/ItemManager.php
diff --git a/src/VectorNetworkProject/TheMix/game/kit/BlueKit.php b/src/VectorNetworkProject/TheMix/game/kit/BlueKit.php
diff --git a/src/VectorNetworkProject/TheMix/game/kit/RedKit.php b/src/VectorNetworkProject/TheMix/game/kit/RedKit.php
diff --git a/src/VectorNetworkProject/TheMix/lib/sound/LevelSounds.php b/src/VectorNetworkProject/TheMix/lib/sound/LevelSounds.php
diff --git a/src/VectorNetworkProject/TheMix/task/BlockReGeneratorTask.php b/src/VectorNetworkProject/TheMix/task/BlockReGeneratorTask.php
diff --git a/src/VectorNetworkProject/TheMix/task/ReSpawnCooldownTask.php b/src/VectorNetworkProject/TheMix/task/ReSpawnCooldownTask.php
diff --git a/src/VectorNetworkProject/TheMix/task/ResetGameTask.php b/src/VectorNetworkProject/TheMix/task/ResetGameTask.php

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,9 @@ class Permissions`
`16`	`16`	`public const USER = 'the.mix.commands.user.';`
`17`	`17`	`public const ADMIN = 'the.mix.commands.admin.';`
`18`	`18`
	`19`	`+ /**`
	`20`	`+ * @return void`
	`21`	`+ */`
`19`	`22`	`public static function registerPermissions(): void`
`20`	`23`	`{`
`21`	`24`	`PermissionManager::getInstance()->addPermission(new Permission(self::USER.'ping', '応答速度を計測します。', Permission::DEFAULT_TRUE));`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public function __construct(Plugin $owner)`
`36`	`36`	`*/`
`37`	`37`	`public function execute(CommandSender $sender, string $commandLabel, array $args)`
`38`	`38`	`{`
`39`		`- $sender->sendMessage('Discord: https://discord.gg/EF2G5dh');`
	`39`	`+ $sender->sendMessage('§9Discord: https://discord.gg/EF2G5dh');`
`40`	`40`
`41`	`41`	`return true;`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,9 @@`
`19`	`19`
`20`	`20`	`class BlockReGeneratorEvent implements Listener`
`21`	`21`	`{`
	`22`	`+ /**`
	`23`	`+ * @param BlockBreakEvent $event`
	`24`	`+ */`
`22`	`25`	`public function event(BlockBreakEvent $event): void`
`23`	`26`	`{`
`24`	`27`	`$block = $event->getBlock();`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,10 @@`
`24`	`24`
`25`	`25`	`class TheBlockBreakEvent implements Listener`
`26`	`26`	`{`
	`27`	`+ /**`
	`28`	`+ * @param BlockBreakEvent $event`
	`29`	`+ * @throws \ReflectionException`
	`30`	`+ */`
`27`	`31`	`public function event(BlockBreakEvent $event)`
`28`	`32`	`{`
`29`	`33`	`$player = $event->getPlayer();`
`@@ -58,7 +62,7 @@ public function event(BlockBreakEvent $event)`
`58`	`62`	`Server::getInstance()->getLogger()->info("{$player->getNameTag()}§fが§cRED§fのコアを破壊している！");`
`59`	`63`	`$block->getLevel()->broadcastLevelSoundEvent($block->asVector3(), LevelSoundEventPacket::SOUND_RANDOM_ANVIL_USE);`
`60`	`64`	`foreach (Server::getInstance()->getOnlinePlayers() as $player) {`
`61`		`- LevelSounds::NotePiano($player, 20);`
	`65`	`+ LevelSounds::NotePiano($player);`
`62`	`66`	`}`
`63`	`67`	`} elseif (BlueCoreManager::isCore($block)) {`
`64`	`68`	`$event->setCancelled();`
`@@ -78,7 +82,7 @@ public function event(BlockBreakEvent $event)`
`78`	`82`	`Server::getInstance()->getLogger()->info("{$player->getNameTag()}§fが§cRED§fのコアを破壊している！");`
`79`	`83`	`$block->getLevel()->broadcastLevelSoundEvent($block->asVector3(), LevelSoundEventPacket::SOUND_RANDOM_ANVIL_USE);`
`80`	`84`	`foreach (Server::getInstance()->getOnlinePlayers() as $player) {`
`81`		`- LevelSounds::NotePiano($player, 20);`
	`85`	`+ LevelSounds::NotePiano($player);`
`82`	`86`	`}`
`83`	`87`	`}`
`84`	`88`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,9 @@`
`16`	`16`
`17`	`17`	`class TheBlockPlaceEvent implements Listener`
`18`	`18`	`{`
	`19`	`+ /**`
	`20`	`+ * @param BlockPlaceEvent $event`
	`21`	`+ */`
`19`	`22`	`public function event(BlockPlaceEvent $event)`
`20`	`23`	`{`
`21`	`24`	`$player = $event->getPlayer();`