Feature complete

* Closes #5
* Changes to some part of the code
* Added support for CPS
* Config version change

plugin.yml

@@ -1,5 +1,5 @@
 name: ScoreHud
 main: JackMD\ScoreHud\Main
 api: [3.0.0]
-version: 1.2.0
-author: JackMD
+version: 1.3.0
+author: JackMD

resources/config.yml

@@ -29,7 +29,7 @@
 
 # DO NOT EDIT THIS VALUE.
 # ONLY FOR INTERNAL USE.
-config-version: "Tesla"
+config-version: 3
 
 # The amount in seconds after which the Scoreboard would update.
 # Increase this value if your server seems to lag.
@@ -67,6 +67,7 @@ server-names:
 # {deaths}              - Get death count of a player. (Requires KDR)
 # {kdr}                 - Get kill to death ratio of a player. (Requires KDR)
 # {time}                - Show the current time. Please see 'time-format' and 'timezone' above to modify it.
+# {cps}                 - Get the clicks per second of a player. Requires CPS.
 
 # Add the lines that would be shown on the Scoreboard.
 # Follow the same pattern as below.

src/JackMD/ScoreHud/Main.php

@@ -35,6 +35,7 @@
 
 use _64FF00\PurePerms\PurePerms;
 use FactionsPro\FactionMain;
+use JackMD\CPS\CPS;
 use JackMD\KDR\KDR;
 use JackMD\ScoreFactory\ScoreFactory;
 use JackMD\ScoreHud\task\ScoreUpdateTask;
@@ -47,7 +48,7 @@
 class Main extends PluginBase{
 
 	/** @var string */
-	private const CONFIG_VERSION = "Tesla";
+	private const CONFIG_VERSION = 3;
 
 	public function onEnable(): void{
 		$this->checkScoreFactory();
@@ -123,7 +124,7 @@ public function updateScore(Player $player): void{
 	private function getPlayerMoney(Player $player){
 		/** @var EconomyAPI $economyAPI */
 		$economyAPI = $this->getServer()->getPluginManager()->getPlugin("EconomyAPI");
-		if($economyAPI !== null){
+		if($economyAPI instanceof EconomyAPI){
 			return $economyAPI->myMoney($player);
 		}else{
 			return "Plugin not found";
@@ -137,7 +138,7 @@ private function getPlayerMoney(Player $player){
 	private function getPlayerRank(Player $player): string{
 		/** @var PurePerms $purePerms */
 		$purePerms = $this->getServer()->getPluginManager()->getPlugin("PurePerms");
-		if($purePerms !== null){
+		if($purePerms instanceof PurePerms){
 			$group = $purePerms->getUserDataMgr()->getData($player)['group'];
 			if($group !== null){
 				return $group;
@@ -157,7 +158,7 @@ private function getPlayerRank(Player $player): string{
 	public function getPrefix(Player $player, $levelName = null): string{
 		/** @var PurePerms $purePerms */
 		$purePerms = $this->getServer()->getPluginManager()->getPlugin("PurePerms");
-		if($purePerms !== null){
+		if($purePerms instanceof PurePerms){
 			$prefix = $purePerms->getUserDataMgr()->getNode($player, "prefix");
 			if($levelName === null){
 				if(($prefix === null) || ($prefix === "")){
@@ -184,7 +185,7 @@ public function getPrefix(Player $player, $levelName = null): string{
 	public function getSuffix(Player $player, $levelName = null): string{
 		/** @var PurePerms $purePerms */
 		$purePerms = $this->getServer()->getPluginManager()->getPlugin("PurePerms");
-		if($purePerms !== null){
+		if($purePerms instanceof PurePerms){
 			$suffix = $purePerms->getUserDataMgr()->getNode($player, "suffix");
 			if($levelName === null){
 				if(($suffix === null) || ($suffix === "")){
@@ -210,7 +211,7 @@ public function getSuffix(Player $player, $levelName = null): string{
 	private function getPlayerPrisonRank(Player $player){
 		/** @var RankUp $rankUp */
 		$rankUp = $this->getServer()->getPluginManager()->getPlugin("RankUp");
-		if($rankUp !== null){
+		if($rankUp instanceof RankUp){
 			$group = $rankUp->getRankUpDoesGroups()->getPlayerGroup($player);
 			if($group !== false){
 				return $group;
@@ -228,7 +229,7 @@ private function getPlayerPrisonRank(Player $player){
 	public function getPlayerFaction(Player $player): string{
 		/** @var FactionMain $factionsPro */
 		$factionsPro = $this->getServer()->getPluginManager()->getPlugin("FactionsPro");
-		if($factionsPro !== null){
+		if($factionsPro instanceof FactionMain){
 			$factionName = $factionsPro->getPlayerFaction($player->getName());
 			if($factionName == null){
 				return "No Faction";
@@ -245,7 +246,7 @@ public function getPlayerFaction(Player $player): string{
 	public function getPlayerKills(Player $player){
 		/** @var KDR $kdr */
 		$kdr = $this->getServer()->getPluginManager()->getPlugin("KDR");
-		if($kdr !== null){
+		if($kdr instanceof KDR){
 			return $kdr->getProvider()->getPlayerKillPoints($player);
 		}else{
 			return "Plugin Not Found";
@@ -259,7 +260,7 @@ public function getPlayerKills(Player $player){
 	public function getPlayerDeaths(Player $player){
 		/** @var KDR $kdr */
 		$kdr = $this->getServer()->getPluginManager()->getPlugin("KDR");
-		if($kdr !== null){
+		if($kdr instanceof KDR){
 			return $kdr->getProvider()->getPlayerDeathPoints($player);
 		}else{
 			return "Plugin Not Found";
@@ -273,13 +274,23 @@ public function getPlayerDeaths(Player $player){
 	public function getPlayerKillToDeathRatio(Player $player): string{
 		/** @var KDR $kdr */
 		$kdr = $this->getServer()->getPluginManager()->getPlugin("KDR");
-		if($kdr !== null){
+		if($kdr instanceof KDR){
 			return $kdr->getProvider()->getKillToDeathRatio($player);
 		}else{
 			return "Plugin Not Found";
 		}
 	}
 
+	public function getClicks(Player $player){
+		/** @var CPS $cps */
+		$cps = $this->getServer()->getPluginManager()->getPlugin("CPS");
+		if($cps instanceof CPS){
+			return $cps->getClicks($player);
+		}else{
+			return "Plugin Not Found";
+		}
+	}
+
 	/**
 	 * @param Player $player
 	 * @param string $string
@@ -312,6 +323,7 @@ public function process(Player $player, string $string): string{
 		$string = str_replace("{prefix}", $this->getPrefix($player), $string);
 		$string = str_replace("{suffix}", $this->getSuffix($player), $string);
 		$string = str_replace("{time}", date($this->getConfig()->get("time-format")), $string);
+		$string = str_replace("{cps}", $this->getClicks($player), $string);
 		return $string;
 	}
 }