From 1809cea4f368597a0ee6b1b4511c3c5739825c71 Mon Sep 17 00:00:00 2001
From: Matthww <Matthww@users.noreply.github.com>
Date: Mon, 15 Apr 2019 10:42:10 +0200
Subject: [PATCH] Name changes

---
 plugin.yml                                      |  2 +-
 src/Matthww/PlayerInfo/PlayerInfo.php           | 17 +++++------------
 .../PlayerInfo/Tasks/FetchModelsTask.php        |  6 ++++--
 3 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/plugin.yml b/plugin.yml
index a6fa030..f9a7622 100644
--- a/plugin.yml
+++ b/plugin.yml
@@ -1,5 +1,5 @@
 name: PlayerInfo
-version: 2.1.0
+version: 2.1.1
 author: Matthww
 api: [3.0.0]
 description: Shows info about a certain player!
diff --git a/src/Matthww/PlayerInfo/PlayerInfo.php b/src/Matthww/PlayerInfo/PlayerInfo.php
index 457906e..8ac3ce2 100644
--- a/src/Matthww/PlayerInfo/PlayerInfo.php
+++ b/src/Matthww/PlayerInfo/PlayerInfo.php
@@ -7,7 +7,6 @@ use Matthww\PlayerInfo\Tasks\LoadTask;
 use Matthww\PlayerInfo\Tasks\SaveTask;
 use pocketmine\command\Command;
 use pocketmine\command\CommandSender;
-use pocketmine\command\ConsoleCommandSender;
 use pocketmine\event\Listener;
 use pocketmine\event\player\PlayerJoinEvent;
 use pocketmine\event\server\DataPacketReceiveEvent;
@@ -36,14 +35,8 @@ class PlayerInfo extends PluginBase implements Listener {
         if(!file_exists($this->getDataFolder() . "config.yml")) {
             $this->saveDefaultConfig();
         }
-        if(!file_exists($this->getDataFolder() . "models.yml")) {
-            $this->getLogger()->notice("downloading new models file...");
-            $this->getServer()->getAsyncPool()->submitTask(new FetchModelsTask($this->getDataFolder()));
-            //$this->saveResource("models.yml", false);
-        } else {
-            $this->getServer()->getAsyncPool()->submitTask(new FetchModelsTask($this->getDataFolder()));
-            $this->getLogger()->notice("updating models file...");
-        }
+        $this->getServer()->getAsyncPool()->submitTask(new FetchModelsTask($this->getDataFolder(), $this->getDescription()->getVersion()));
+        $this->getLogger()->notice("updating models file...");
     }
 
     public function onPacketReceived(DataPacketReceiveEvent $receiveEvent) {
@@ -65,7 +58,7 @@ class PlayerInfo extends PluginBase implements Listener {
             $this->getScheduler()->scheduleTask(new SaveTask(
                 $this,
                 $player->getName(),
-                $this->DeviceModel($cdata["DeviceModel"]),
+                $this->getModel($cdata["DeviceModel"]),
                 $os[$cdata["DeviceOS"]],
                 $player->getAddress(),
                 $UI[$cdata["UIProfile"]],
@@ -75,7 +68,7 @@ class PlayerInfo extends PluginBase implements Listener {
         }
     }
 
-    public function DeviceModel(string $model) {
+    public function getModel(string $model) {
         $models = yaml_parse_file($this->getDataFolder() . "models.yml");
 
         if(isset($models[$model])) {
@@ -127,7 +120,7 @@ class PlayerInfo extends PluginBase implements Listener {
                     $sender->sendMessage(TF::AQUA . "OS: " . TF::RED . $os[$cdata["DeviceOS"]]);
                 }
                 if($this->getConfig()->get("Model") == true) {
-                    $sender->sendMessage(TF::AQUA . "Model: " . TF::RED . $this->DeviceModel($cdata["DeviceModel"]));
+                    $sender->sendMessage(TF::AQUA . "Model: " . TF::RED . $this->getModel($cdata["DeviceModel"]));
                 }
                 if($this->getConfig()->get("UI") == true) {
                     $sender->sendMessage(TF::AQUA . "UI: " . TF::RED . $UI[$cdata["UIProfile"]]);
diff --git a/src/Matthww/PlayerInfo/Tasks/FetchModelsTask.php b/src/Matthww/PlayerInfo/Tasks/FetchModelsTask.php
index 21a2624..73f391d 100644
--- a/src/Matthww/PlayerInfo/Tasks/FetchModelsTask.php
+++ b/src/Matthww/PlayerInfo/Tasks/FetchModelsTask.php
@@ -8,13 +8,15 @@ use pocketmine\utils\Internet;
 class FetchModelsTask extends AsyncTask {
 
     private $path;
+    private $version;
 
-    public function __construct(string $path) {
+    public function __construct(string $path, string $version) {
         $this->path = $path;
+        $this->version = $version;
     }
 
     public function onRun() {
-        $result = Internet::getURL("https://playerinfo.hillcraft.net/models.yml");
+        $result = Internet::getURL("https://playerinfo.hillcraft.net/models.yml?v=" . $this->version);
         if(!is_string($result)) {
             $this->setResult(false);
             return;