Update plugin to api 3.0.0

ProjectInfinity · ProjectInfinity · commit 0b08e576a83d · 2018-07-14T23:33:46.000+02:00
diff --git a/plugin.yml b/plugin.yml
@@ -1,7 +1,7 @@
 name: PocketVote
 main: ProjectInfinity\PocketVote\PocketVote
-version: 2.1.2
-api: [3.0.0-ALPHA6, 3.0.0-ALPHA7, 3.0.0-ALPHA8, 3.0.0-ALPHA9, 3.0.0-ALPHA10, 3.0.0-ALPHA11, 3.0.0-ALPHA12]
+version: 2.1.3
+api: [3.0.0, 3.0.1, 3.0.2, 3.0.3, 3.0.4, 3.0.5, 3.0.6]
 author: ProjectInfinity
 permissions:
   pocketvote.admin:
diff --git a/src/ProjectInfinity/PocketVote/PocketVote.php b/src/ProjectInfinity/PocketVote/PocketVote.php
@@ -148,15 +148,15 @@ public function onEnable() {
             }
         }
 
-        $this->schedulerTask = $this->getServer()->getScheduler()->scheduleRepeatingTask(new SchedulerTask($this), 1200); # 1200 ticks = 60 seconds.
+        $this->schedulerTask = $this->getScheduler()->scheduleRepeatingTask(new SchedulerTask($this), 1200); # 1200 ticks = 60 seconds.
         # Get voting link.
-        $this->getServer()->getScheduler()->scheduleAsyncTask(new VoteLinkTask($this->identity));
+        $this->getServer()->getAsyncPool()->submitTask(new VoteLinkTask($this->identity));
         # Report usage.
-        $this->getServer()->getScheduler()->scheduleAsyncTask(new HeartbeatTask($this->identity));
+        $this->getServer()->getAsyncPool()->submitTask(new HeartbeatTask($this->identity));
     }
 
     public function onDisable() {
-        $this->getServer()->getScheduler()->cancelTasks($this);
+        $this->getScheduler()->cancelAllTasks();
         self::$plugin = null;
         self::$cert = null;
         self::$dev = null;
@@ -183,7 +183,7 @@ public function startScheduler(int $seconds) {
         if(!$this->schedulerTask->isCancelled()) $this->schedulerTask->cancel();
 
         $this->schedulerTs = $time;
-        $this->schedulerTask = $this->getServer()->getScheduler()->scheduleRepeatingTask(new SchedulerTask($this), $seconds > 0 ? ($seconds * 20) : 1200);
+        $this->schedulerTask = $this->getScheduler()->scheduleRepeatingTask(new SchedulerTask($this), $seconds > 0 ? ($seconds * 20) : 1200);
         $this->schedulerFreq = $seconds;
 
         $this->getLogger()->debug("Scheduler interval changed to $seconds seconds.");
diff --git a/src/ProjectInfinity/PocketVote/VoteListener.php b/src/ProjectInfinity/PocketVote/VoteListener.php
@@ -20,6 +20,7 @@ public function __construct(PocketVote $plugin) {
 
     /**
      * @priority LOWEST
+     * @param VoteEvent $event
      */
     public function onVoteEvent(VoteEvent $event) {
         if($event->isCancelled()) return;
@@ -49,6 +50,7 @@ public function onVoteEvent(VoteEvent $event) {
 
     /**
      * @priority LOWEST
+     * @param PlayerJoinEvent $event
      */
     public function onPlayerJoin(PlayerJoinEvent $event) {
         if(PocketVote::$hasVRC) $this->vm->scheduleVRCTask($event->getPlayer()->getName()); # TODO: This should be possible to disable and only allow through commands.
diff --git a/src/ProjectInfinity/PocketVote/cmd/PocketVoteCommand.php b/src/ProjectInfinity/PocketVote/cmd/PocketVoteCommand.php
@@ -63,7 +63,7 @@ public function execute(CommandSender $sender, string $commandLabel, array $args
 
             case 'DIAGNOSE':
                 $sender->sendMessage(TextFormat::GREEN.'Scheduling a diagnosis...');
-                $this->plugin->getServer()->getScheduler()->scheduleAsyncTask(new DiagnoseTask($this->plugin->getDescription()->getVersion(), $sender->getName()));
+                $this->plugin->getServer()->getAsyncPool()->submitTask(new DiagnoseTask($this->plugin->getDescription()->getVersion(), $sender->getName()));
                 break;
 
             case 'CMD':
@@ -179,7 +179,7 @@ public function execute(CommandSender $sender, string $commandLabel, array $args
                     $sender->sendMessage(TextFormat::RED.'You need to specify a name. /pv link [name]');
                     return true;
                 }
-                $this->getPlugin()->getServer()->getScheduler()->scheduleAsyncTask(new SetLinkNameTask($sender->getName(), $args[1]));
+                $this->getPlugin()->getServer()->getAsyncPool()->submitTask(new SetLinkNameTask($sender->getName(), $args[1]));
                 break;
 
             default:
diff --git a/src/ProjectInfinity/PocketVote/cmd/VoteCommand.php b/src/ProjectInfinity/PocketVote/cmd/VoteCommand.php
@@ -25,7 +25,7 @@ public function execute(CommandSender $sender, String $commandLabel, array $args
             return true;
         }
         if(isset($args[0]) && strtoupper($args[0]) === 'TOP') {
-            $this->plugin->getServer()->getScheduler()->scheduleAsyncTask(new TopVoterTask($this->plugin->identity, $sender->getName()));
+            $this->plugin->getServer()->getAsyncPool()->submitTask(new TopVoterTask($this->plugin->identity, $sender->getName()));
             return true;
         }
         $link = $this->plugin->getVoteManager()->getVoteLink();
diff --git a/src/ProjectInfinity/PocketVote/cmd/guru/GuAddCommand.php b/src/ProjectInfinity/PocketVote/cmd/guru/GuAddCommand.php
@@ -55,7 +55,7 @@ public function execute(CommandSender $sender, String $commandLabel, array $args
                 break;
         }
 
-        $this->plugin->getServer()->getScheduler()->scheduleAsyncTask(new AddLinkTask($sender->getName(), $title, $link));
+        $this->plugin->getServer()->getAsyncPool()->submitTask(new AddLinkTask($sender->getName(), $title, $link));
         return true;
     }
 }
diff --git a/src/ProjectInfinity/PocketVote/cmd/guru/GuDelCommand.php b/src/ProjectInfinity/PocketVote/cmd/guru/GuDelCommand.php
@@ -33,7 +33,7 @@ public function execute(CommandSender $sender, String $commandLabel, array $args
             return true;
         }
 
-        $this->plugin->getServer()->getScheduler()->scheduleAsyncTask(new DeleteLinkTask($sender->getName(), (int)$args[0]));
+        $this->plugin->getServer()->getAsyncPool()->submitTask(new DeleteLinkTask($sender->getName(), (int)$args[0]));
         return true;
     }
 }
diff --git a/src/ProjectInfinity/PocketVote/cmd/guru/GuListCommand.php b/src/ProjectInfinity/PocketVote/cmd/guru/GuListCommand.php
@@ -20,7 +20,7 @@ public function execute(CommandSender $sender, String $commandLabel, array $args
             $sender->sendMessage(TextFormat::RED.'You do not have permission to do that.');
             return true;
         }
-        PocketVote::getPlugin()->getServer()->getScheduler()->scheduleAsyncTask(new GetLinksTask($sender->getName()));
+        PocketVote::getPlugin()->getServer()->getAsyncPool()->submitTask(new GetLinksTask($sender->getName()));
         return true;
     }
 }
diff --git a/src/ProjectInfinity/PocketVote/cmd/guru/GuruCommand.php b/src/ProjectInfinity/PocketVote/cmd/guru/GuruCommand.php
@@ -9,7 +9,7 @@
 class GuruCommand extends Command {
 
     public function __construct() {
-        parent::__construct('guru', 'MCPE Guru help command', '/guru [subject]', ['gu']);
+        parent::__construct('guru', 'MCPE Guru help command', '/guru', ['gu']);
     }
 
     public function execute(CommandSender $sender, String $commandLabel, array $args) {
diff --git a/src/ProjectInfinity/PocketVote/event/VoteDispatchEvent.php b/src/ProjectInfinity/PocketVote/event/VoteDispatchEvent.php
@@ -2,35 +2,49 @@
 
 namespace ProjectInfinity\PocketVote\event;
 
+use pocketmine\event\Cancellable;
+use pocketmine\event\plugin\PluginEvent;
+use pocketmine\Server;
 use ProjectInfinity\PocketVote\PocketVote;
 
-class VoteDispatchEvent extends VoteEvent {
+class VoteDispatchEvent extends PluginEvent implements Cancellable {
 
     public static $handlerList = null;
 
+    private $player, $ip, $site;
+
     public function __construct(PocketVote $plugin, $player, $ip, $site) {
-        parent::__construct($plugin, $player, $ip, $site);
+        parent::__construct($plugin);
+        $this->player = $player;
+        $this->ip = $ip;
+        $this->site = $site;
     }
 
     /**
-     * @return string
+     * Returns the player that voted.
+     *
+     * @return mixed
      */
     public function getPlayer() {
-        return parent::getPlayer();
+        return $this->player;
     }
 
     /**
-     * @return string
+     * Get the IP of the player that voted.
+     *
+     * @return mixed
      */
     public function getIp() {
-        return parent::getIp();
+        return $this->ip;
     }
 
     /**
-     * @return string
+     * Get the site the player voted on.
+     *
+     * @return mixed
      */
     public function getSite() {
-        return parent::getSite();
+        return $this->site;
     }
 
 }
diff --git a/src/ProjectInfinity/PocketVote/event/VoteEvent.php b/src/ProjectInfinity/PocketVote/event/VoteEvent.php
@@ -53,7 +53,7 @@ public function getSite() {
      * 
      * @return bool
      */
-    public function isOnline() {
+    public function isOnline(): bool {
         return Server::getInstance()->getPlayer($this->player) !== null;    
     }
 
diff --git a/src/ProjectInfinity/PocketVote/task/HeartbeatTask.php b/src/ProjectInfinity/PocketVote/task/HeartbeatTask.php
@@ -46,7 +46,7 @@ public function onRun() {
 
         if($this->secret === null || $this->identity === null) return;
 
-        $curl = curl_init($this->isDev ? 'http://127.0.0.1/v2/heartbeat' : 'https://api.pocketvote.io/v2/heartbeat');
+        $curl = curl_init($this->isDev ? 'http://127.0.0.1:9000/v2/heartbeat' : 'https://api.pocketvote.io/v2/heartbeat');
 
         curl_setopt_array($curl, [
             CURLOPT_RETURNTRANSFER => 1,
diff --git a/src/ProjectInfinity/PocketVote/task/SchedulerTask.php b/src/ProjectInfinity/PocketVote/task/SchedulerTask.php
@@ -17,7 +17,7 @@ public function __construct(PocketVote $plugin) {
 
     public function onRun(int $currentTick) {
         $this->plugin->getLogger()->debug('Checking for outstanding votes.');
-        if(!$this->plugin->multiserver || ($this->plugin->multiserver && strtolower($this->plugin->multiserver_role) === 'master')) $this->plugin->getServer()->getScheduler()->scheduleAsyncTask(new VoteCheckTask($this->plugin->identity, $this->plugin->secret, $this->version));
-        if($this->plugin->multiserver && strtolower($this->plugin->multiserver_role) === 'slave') $this->plugin->getServer()->getScheduler()->scheduleAsyncTask(new SlaveCheckTask());
+        if(!$this->plugin->multiserver || ($this->plugin->multiserver && strtolower($this->plugin->multiserver_role) === 'master')) $this->plugin->getServer()->getAsyncPool()->submitTask(new VoteCheckTask($this->plugin->identity, $this->plugin->secret, $this->version));
+        if($this->plugin->multiserver && strtolower($this->plugin->multiserver_role) === 'slave') $this->plugin->getServer()->getAsyncPool()->submitTask(new SlaveCheckTask());
     }
 }
diff --git a/src/ProjectInfinity/PocketVote/util/VoteManager.php b/src/ProjectInfinity/PocketVote/util/VoteManager.php
@@ -24,47 +24,47 @@ public function __construct(PocketVote $plugin) {
         $this->votes = $plugin->getConfig()->get('votes', []);
         $this->loadedVRC = [];
         $this->currentVRCTasks = [];
-        if($this->plugin->expiration > 0) $plugin->getServer()->getScheduler()->scheduleDelayedRepeatingTask(new ExpireVotesTask(), 300, 6000);
+        if($this->plugin->expiration > 0) $plugin->getScheduler()->scheduleDelayedRepeatingTask(new ExpireVotesTask(), 300, 6000);
     }
 
-    public function addVRC($record) {
+    public function addVRC($record): void {
         $this->loadedVRC[] = $record;
     }
 
     public function getVRC(): array {
         return $this->loadedVRC;
     }
 
-    public function removeVRCTask($player) {
+    public function removeVRCTask($player): void {
         if(!isset($this->currentVRCTasks[$player])) return;
         unset($this->currentVRCTasks[$player]);
     }
 
-    public function scheduleVRCTask($player) {
+    public function scheduleVRCTask($player) : void {
         if((PocketVote::$hasVRC && !$this->plugin->multiserver) || (PocketVote::$hasVRC && $this->plugin->multiserver && $this->plugin->multiserver_role === 'master')) {
             if(isset($this->currentVRCTasks[$player])) return;
             # Only run when VRC is enabled and multiserver is off or VRC is enabled and multiserver and server role is set to master.
-            $this->plugin->getServer()->getScheduler()->scheduleAsyncTask(new VRCCheckTask($player));
+            $this->plugin->getScheduler()->scheduleAsyncTask(new VRCCheckTask($player));
         }
     }
 
     public function getVoteLink() {
         return $this->voteLink;
     }
 
-    public function setVoteLink($link) {
+    public function setVoteLink($link): void {
         $this->voteLink = $link;
     }
     
-    public function hasVotes($player) {
+    public function hasVotes($player): bool {
         $player = strtolower($player);
         foreach($this->votes as $key => $vote) {
             if(strtolower($vote['player']) === $player) return true;
         }
         return false;
     }
     
-    public function getVotes($player) {
+    public function getVotes($player): array {
         $votes = [];
         $player = strtolower($player);
         foreach($this->votes as $key => $vote) {
@@ -75,20 +75,20 @@ public function getVotes($player) {
         return $votes;
     } 
     
-    public function addVote($player, $site, $ip) {
+    public function addVote($player, $site, $ip): void {
         $this->votes[] = ['player' => $player, 'site' => $site, 'ip' => $ip, 'expires' => time() + $this->plugin->expiration];
     }
     
-    public function removeVote($key) {
+    public function removeVote($key): void {
         unset($this->votes[$key]);
     }
 
-    public function commit() {
+    public function commit(): void {
         $this->plugin->getConfig()->set('votes', array_values($this->votes));
         $this->plugin->saveConfig();
     }
 
-    public function expireVotes() {
+    public function expireVotes(): void {
         $expired = 0;
         $ts = time();
         foreach($this->votes as $key => $vote) {

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public function execute(CommandSender $sender, String $commandLabel, array $args`
`25`	`25`	`return true;`
`26`	`26`	`}`
`27`	`27`	`if(isset($args[0]) && strtoupper($args[0]) === 'TOP') {`
`28`		`- $this->plugin->getServer()->getScheduler()->scheduleAsyncTask(new TopVoterTask($this->plugin->identity, $sender->getName()));`
	`28`	`+ $this->plugin->getServer()->getAsyncPool()->submitTask(new TopVoterTask($this->plugin->identity, $sender->getName()));`
`29`	`29`	`return true;`
`30`	`30`	`}`
`31`	`31`	`$link = $this->plugin->getVoteManager()->getVoteLink();`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ public function execute(CommandSender $sender, String $commandLabel, array $args`
`55`	`55`	`break;`
`56`	`56`	`}`
`57`	`57`
`58`		`- $this->plugin->getServer()->getScheduler()->scheduleAsyncTask(new AddLinkTask($sender->getName(), $title, $link));`
	`58`	`+ $this->plugin->getServer()->getAsyncPool()->submitTask(new AddLinkTask($sender->getName(), $title, $link));`
`59`	`59`	`return true;`
`60`	`60`	`}`
`61`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public function execute(CommandSender $sender, String $commandLabel, array $args`
`33`	`33`	`return true;`
`34`	`34`	`}`
`35`	`35`
`36`		`- $this->plugin->getServer()->getScheduler()->scheduleAsyncTask(new DeleteLinkTask($sender->getName(), (int)$args[0]));`
	`36`	`+ $this->plugin->getServer()->getAsyncPool()->submitTask(new DeleteLinkTask($sender->getName(), (int)$args[0]));`
`37`	`37`	`return true;`
`38`	`38`	`}`
`39`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ public function execute(CommandSender $sender, String $commandLabel, array $args`
`20`	`20`	`$sender->sendMessage(TextFormat::RED.'You do not have permission to do that.');`
`21`	`21`	`return true;`
`22`	`22`	`}`
`23`		`- PocketVote::getPlugin()->getServer()->getScheduler()->scheduleAsyncTask(new GetLinksTask($sender->getName()));`
	`23`	`+ PocketVote::getPlugin()->getServer()->getAsyncPool()->submitTask(new GetLinksTask($sender->getName()));`
`24`	`24`	`return true;`
`25`	`25`	`}`
`26`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`class GuruCommand extends Command {`
`10`	`10`
`11`	`11`	`public function __construct() {`
`12`		`- parent::__construct('guru', 'MCPE Guru help command', '/guru [subject]', ['gu']);`
	`12`	`+ parent::__construct('guru', 'MCPE Guru help command', '/guru', ['gu']);`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`public function execute(CommandSender $sender, String $commandLabel, array $args) {`