Update Main.php

Author: alejandroliu

BasicHUD/src/aliuly/hud/Main.php

@@ -7,6 +7,9 @@
 use pocketmine\scheduler\PluginTask;
 use pocketmine\event\Listener;
 use pocketmine\event\player\PlayerQuitEvent;
+use pocketmine\event\player\PlayerCommandPreprocessEvent;
+use pocketmine\event\server\RemoteServerCommandEvent;
+use pocketmine\event\server\ServerCommandEvent;
 use pocketmine\permission\Permission;
 use pocketmine\command\CommandExecutor;
 use pocketmine\command\CommandSender;
@@ -51,20 +54,22 @@ public function onRun($currentTick){
 		foreach ($plugin->getServer()->getOnlinePlayers() as $pl) {
 			if (!$pl->hasPermission("basichud.user")) continue;
 			$msg = $plugin->getMessage($pl);
-			if ($msg != "") $pl->sendPopup($msg);
+			if ($msg !== null) $pl->sendPopup($msg);
 		}
 	}
 
 }
 
 class Main extends PluginBase implements Listener,CommandExecutor {
-	protected $_getMessage;
-	protected $_getVars;
+	protected $_getMessage;		// Message function (to disabled)
+	protected $_getVars;			// Customize variables
 
-	protected $format;
-	protected $sendPopup;
-	protected $disabled;
-	protected $perms;
+	protected $format;				// HUD format
+	protected $sendPopup;			// Message to popup through API
+	protected $disabled;			// HUD disabled by command
+	protected $perms;					// Attachable permissions
+	protected $consts;				// These are constant variables...
+	protected $perms_cache;		// Permissions cache
 
 	static public function pickFormatter($format) {
 		if (strpos($format,"<?php") !== false|| strpos($format,"<?=") !== false) {
@@ -122,6 +127,7 @@ private function changePermission($player,$perm,$bool) {
 		}
 		$attach = $this->perms[$n];
 		$attach->setPermission($perm,$bool);
+		if (isset($this->perms_cache[$n])) unset($this->perms_cache[$n])
 	}
 
 	public function getMessage($player) {
@@ -130,18 +136,71 @@ public function getMessage($player) {
 	}
 
 	public function getVars($player) {
-		$vars = [
+		$vars = $this->consts;
+		foreach ([
+				"{tps}"] => $this->getServer()->getTicksPerSecond(),
+				"{player}"] => $player->getName(),
+				"{world}" => $player->getLevel()->getName(),
+				"{x}" => (int)$player->getX(),
+				"{y}" => (int)$player->getY(),
+				"{z}" => (int)$player->getZ(),
+				"{yaw}" => (int)$player->getYaw(),
+				"{pitch}" => (int)$player->getPitch(),
+				"{bearing}" => self::bearing($player->getYaw()),
+			] as $a => $b) {
+			$vars[$a] = $b;
+		}
+  	$fn = $this->_getVars;
+		$fn($this,$vars,$player);
+		return $vars;
+	}
+
+	public function defaultGetMessage($player) {
+		$n = strtolower($player->getName());
+		if (isset($this->sendPopup[$n])) {
+			// An API user wants to post a Popup...
+			list($msg,$timer) = $this->sendPopup[$n];
+			if (microtime(true) < $timer) return $msg;
+			unset($this->sendPopup[$n]);
+		}
+		if (isset($this->disabled[$n])) return null;
+
+		// Manage custom groups
+		if (is_array($this->format[0])) {
+			if (!isset($this->perms_cache[$n])) {
+				$i = 0;
+				foreach ($this->format as $rr) {
+					list($rank,$fmt,$formatter) = $rr;
+					if ($player->hasPermission("basichud.rank.".$rank)) {
+						$this->perms_cache[$n] = $i;
+						break;
+					}
+					++$i;
+				}
+			} else {
+				list($rank,$fmt,$formatter) = $this->format[$rank = $this->perms_cache[$n]];
+			}
+		} else {
+			list($fmt,$formatter) = $this->format;
+		}
+		$txt = $formatter::formatString($this,$fmt,$player);
+		return $txt;
+	}
+
+	public function onEnable(){
+		$this->disabled = [];
+		$this->sendPopup = [];
+		$this->perms = [];
+
+		if (!is_dir($this->getDataFolder())) mkdir($this->getDataFolder());
+		/* Save default resources */
+		$this->saveResource("message-example.php",true);
+		$this->saveResource("vars-example.php",true);
+
+		// These are constants that should be pre calculated
+		$this->consts = [
 			"{BasicHUD}" => $this->getDescription()->getFullName(),
 			"{MOTD}" => $this->getServer()->getMotd(),
-			"{tps}" => $this->getServer()->getTicksPerSecond(),
-			"{player}" => $player->getName(),
-			"{world}" => $player->getLevel()->getName(),
-			"{x}" => (int)$player->getX(),
-			"{y}" => (int)$player->getY(),
-			"{z}" => (int)$player->getZ(),
-			"{yaw}" => (int)$player->getYaw(),
-			"{pitch}" => (int)$player->getPitch(),
-			"{bearing}" => self::bearing($player->getYaw()),
 			"{10SPACE}" => str_repeat(" ",10),
 			"{20SPACE}" => str_repeat(" ",20),
 			"{30SPACE}" => str_repeat(" ",30),
@@ -171,63 +230,20 @@ public function getVars($player) {
 			"{ITALIC}" => TextFormat::ITALIC,
 			"{RESET}" => TextFormat::RESET,
 		];
-		if ($this->_getVars !== null) {
-			$fn = $this->_getVars;
-			$fn($this,$vars,$player);
-		}
-		return $vars;
-	}
-
-	public function sendPopup($player,$msg,$length=3) {
-		if ($this->isEnabled()) {
-			if ($player->hasPermission("basichud.user")) {
-				$n = strtolower($player->getName());
-				$this->sendPopup[$n] = [ $msg, microtime(true)+$length ];
-				$msg = $this->getMessage($player);
-			}
-		}
-		$player->sendPopup($msg);
-	}
-
-	public function defaultGetMessage($player) {
-		$n = strtolower($player->getName());
-		if (isset($this->sendPopup[$n])) {
-			list($msg,$timer) = $this->sendPopup[$n];
-			if (microtime(true) < $timer) return $msg;
-			unset($this->sendPopup[$n]);
-		}
-		if (isset($this->disabled[$n])) return "";
 
-		// Manage custom groups
-		if (is_array($this->format[0])) {
-			foreach ($this->format as $rr) {
-				list($rank,$fmt,$formatter) = $rr;
-				if ($player->hasPermission("basichud.rank.".$rank)) break;
-			}
-		} else {
-			list($fmt,$formatter) = $this->format;
-		}
-		$txt = $formatter::formatString($this,$fmt,$player);
-		return $txt;
-	}
-
-	public function onEnable(){
-		$this->disabled = [];
-		$this->sendPopup = [];
-		$this->perms = [];
-		if (!is_dir($this->getDataFolder())) mkdir($this->getDataFolder());
-		/* Save default resources */
-		$this->saveResource("message-example.php",true);
-		$this->saveResource("vars-example.php",true);
 
 		$defaults = [
 			"version" => $this->getDescription()->getVersion(),
-			"ticks" => 15,
+			"ticks" => 10,
 			"format" => "{GREEN}{BasicHUD} {WHITE}{world} ({x},{y},{z}) {bearing}",
 		];
+
 		$cf = (new Config($this->getDataFolder()."config.yml",
 								Config::YAML,$defaults))->getAll();
+
 		if (is_array($cf["format"])) {
+			// Multiple format specified...
+			// save them and also register the appropriate permissions
 			$this->format = [];
 			foreach ($cf["format"] as $rank=>$fmt) {
 				$this->format[] = [ $rank, $fmt, self::pickFormatter($fmt) ];
@@ -236,6 +252,7 @@ public function onEnable(){
 				$this->getServer()->getPluginManager()->addPermission($p);
 			}
 		} else {
+			// Single format only
 			$this->format = [ $cf["format"], self::pickFormatter($cf["format"]) ];
 		}
 		$code = '$this->_getMessage = function($plugin,$player){';
@@ -254,14 +271,30 @@ public function onEnable(){
 			//echo $code."\n";//##DEBUG
 			eval($code);
 		} else {
-			$this->_getVars = null;
+			// Empty function (this means we do not need to test _getVars)
+			$this->_getVars = function(){};
 		}
 		$this->getServer()->getScheduler()->scheduleRepeatingTask(new PopupTask($this), $cf["ticks"]);
 		$this->getServer()->getPluginManager()->registerEvents($this, $this);
 	}
 
+	// We clear the permissions cache in the event of a command
+	// next time we schedule to fetch the HUD message it will be recomputed
+  private function onCmdEvent() {
+		$this->perms_cache = []
+	}
+	public function onPlayerCmd(PlayerCommandPreprocessEvent $ev) {
+			$this->onCmdEvent();
+	}
+	public function onRconCmd(RemoteServerCommandEvent $ev) {
+		$this->onCmdEvent();
+	}
+	public function onConsoleCmd(ServerCommandEvent $ev) {
+		$this->onCmdEvent();
+	}
 	public function onQuit(PlayerQuitEvent $ev) {
 		$n = strtolower($ev->getPlayer()->getName());
+		if (isset($this->perms_cache[$n])) unset($this->perms_cache[$n])
 		if (isset($this->sendPopup[$n])) unset($this->sendPopup[$n]);
 		if (isset($this->disabled[$n])) unset($this->disabled[$n]);
 		if (isset($this->perms[$n])) {
@@ -319,10 +352,8 @@ public function onCommand(CommandSender $sender, Command $cmd, $label, array $ar
 						list($rn,,) = $rr2;
 						if ($rank == $rn) {
 							$this->changePermission($sender,"basichud.rank.".$rn,true);
-							$sender->addAttachment($this,"basichud.rank.".$rn,true);
 						} else {
 							$this->changePermission($sender,"basichud.rank.".$rn,false);
-							$sender->addAttachment($this,"basichud.rank.".$rn,false);
 						}
 					}
 					$sender->sendMessage("Switching to format $rank");
@@ -344,4 +375,18 @@ public function onCommand(CommandSender $sender, Command $cmd, $label, array $ar
 		$sender->sendMessage("Turning off HUD");
 		return true;
 	}
+
+	/**
+	 * @API
+	 */
+	public function sendPopup($player,$msg,$length=3) {
+		if ($this->isEnabled()) {
+			if ($player->hasPermission("basichud.user")) {
+				$n = strtolower($player->getName());
+				$this->sendPopup[$n] = [ $msg, microtime(true)+$length ];
+				$msg = $this->getMessage($player);
+			}
+		}
+		$player->sendPopup($msg);
+	}
 }