Name changes

This commit is contained in:
Matthew 2019-04-15 10:42:10 +02:00
parent 9093219a29
commit 1809cea4f3
3 changed files with 10 additions and 15 deletions

View File

@ -1,5 +1,5 @@
name: PlayerInfo name: PlayerInfo
version: 2.1.0 version: 2.1.1
author: Matthww author: Matthww
api: [3.0.0] api: [3.0.0]
description: Shows info about a certain player! description: Shows info about a certain player!

View File

@ -7,7 +7,6 @@ use Matthww\PlayerInfo\Tasks\LoadTask;
use Matthww\PlayerInfo\Tasks\SaveTask; use Matthww\PlayerInfo\Tasks\SaveTask;
use pocketmine\command\Command; use pocketmine\command\Command;
use pocketmine\command\CommandSender; use pocketmine\command\CommandSender;
use pocketmine\command\ConsoleCommandSender;
use pocketmine\event\Listener; use pocketmine\event\Listener;
use pocketmine\event\player\PlayerJoinEvent; use pocketmine\event\player\PlayerJoinEvent;
use pocketmine\event\server\DataPacketReceiveEvent; use pocketmine\event\server\DataPacketReceiveEvent;
@ -36,14 +35,8 @@ class PlayerInfo extends PluginBase implements Listener {
if(!file_exists($this->getDataFolder() . "config.yml")) { if(!file_exists($this->getDataFolder() . "config.yml")) {
$this->saveDefaultConfig(); $this->saveDefaultConfig();
} }
if(!file_exists($this->getDataFolder() . "models.yml")) { $this->getServer()->getAsyncPool()->submitTask(new FetchModelsTask($this->getDataFolder(), $this->getDescription()->getVersion()));
$this->getLogger()->notice("downloading new models file..."); $this->getLogger()->notice("updating 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...");
}
} }
public function onPacketReceived(DataPacketReceiveEvent $receiveEvent) { public function onPacketReceived(DataPacketReceiveEvent $receiveEvent) {
@ -65,7 +58,7 @@ class PlayerInfo extends PluginBase implements Listener {
$this->getScheduler()->scheduleTask(new SaveTask( $this->getScheduler()->scheduleTask(new SaveTask(
$this, $this,
$player->getName(), $player->getName(),
$this->DeviceModel($cdata["DeviceModel"]), $this->getModel($cdata["DeviceModel"]),
$os[$cdata["DeviceOS"]], $os[$cdata["DeviceOS"]],
$player->getAddress(), $player->getAddress(),
$UI[$cdata["UIProfile"]], $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"); $models = yaml_parse_file($this->getDataFolder() . "models.yml");
if(isset($models[$model])) { if(isset($models[$model])) {
@ -127,7 +120,7 @@ class PlayerInfo extends PluginBase implements Listener {
$sender->sendMessage(TF::AQUA . "OS: " . TF::RED . $os[$cdata["DeviceOS"]]); $sender->sendMessage(TF::AQUA . "OS: " . TF::RED . $os[$cdata["DeviceOS"]]);
} }
if($this->getConfig()->get("Model") == true) { 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) { if($this->getConfig()->get("UI") == true) {
$sender->sendMessage(TF::AQUA . "UI: " . TF::RED . $UI[$cdata["UIProfile"]]); $sender->sendMessage(TF::AQUA . "UI: " . TF::RED . $UI[$cdata["UIProfile"]]);

View File

@ -8,13 +8,15 @@ use pocketmine\utils\Internet;
class FetchModelsTask extends AsyncTask { class FetchModelsTask extends AsyncTask {
private $path; private $path;
private $version;
public function __construct(string $path) { public function __construct(string $path, string $version) {
$this->path = $path; $this->path = $path;
$this->version = $version;
} }
public function onRun() { 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)) { if(!is_string($result)) {
$this->setResult(false); $this->setResult(false);
return; return;