Updates for Minecraft 1.19.4

Updates to the _lag and _users scripts to account for changes in the
process of upgrading s2 to Minecraft 1.19.4, while preserving backwards
compatibility. Fixes for the other scripts to come Eventually™.

Change-Id: I2269727bbd77b41d5fb6488ece29a63d5522c6d7

Author: FastLizard4

minecraft_lag.php

@@ -29,28 +29,36 @@
 */
 
 require_once("busybody.php");
-$data = dataPlz();
-
-$res = array();
 
 if($argv[1] == "config") {
 	echo "graph_title " . ((empty($_ENV['customTitle'])) ? "Minecraft Server Lag" : $_ENV['customTitle'] . " Server Lag") . "\n";
 	echo "graph_vlabel Ticks per second (TPS)\n";
 	echo "graph_category minecraft\n";
-	echo "tps.label Actual TPS\n";
+	echo "tps.label Actual TPS (1-minute average)\n";
 	echo "tps.colour ff0000\n";
 	echo "normal.label Normal TPS\n";
 	echo "normal.colour 0fc20f\n";
 	die();
 }
 
-if(preg_match('/\[[#_]+\] ([0-9,.]+) TPS/', $data, $matches)) {
+$data = dataPlz();
+
+if (preg_match('/\[[#_]+] ([0-9,.]+) TPS/', $data, $matches)) {
 	$tps = str_replace(',', '', $matches[1]);
 
 	echo "tps.value {$tps}\n";
 	echo "normal.value 20.00\n";
 } else {
-	echo "Error reading RCON data!\n";
-	exit(1);
+	$data = $data = dataPlz("tps");
+
+	if (preg_match('/TPS from last 1m, 5m, 15m: ([0-9.]+), ([0-9.]+), ([0-9.]+)/', $data, $matches)) {
+		$tps = str_replace(',', '', $matches[1]);
+
+		echo "tps.value {$tps}\n";
+		echo "normal.value 20.00\n";
+	} else {
+		echo "Error reading RCON data!\n";
+		exit(1);
+	}
 }
 ?>

minecraft_users.php

@@ -30,7 +30,7 @@
 
 $res = array();
 
-if($argv[1] == "config") {
+if ($argv[1] == "config") {
 	echo "graph_title " . ((empty($_ENV['customTitle'])) ? "Minecraft Users" : $_ENV['customTitle'] . " Users") . "\n";
 	echo "graph_vlabel Users\n";
 	echo "graph_category minecraft\n";
@@ -39,7 +39,13 @@
 	die();
 }
 
-if(preg_match('/There are ([0-9]+)\/([0-9]+) players online:/', $data, $matches)) {
+if (preg_match('/There are ([0-9]+)\/([0-9]+) players online:/', $data, $matches)) {
+	$users = str_replace(',', '', $matches[1]);
+	$maxusers = str_replace(',', '', $matches[2]);
+
+	echo "users.value {$users}\n";
+	echo "maxusers.value {$maxusers}\n";
+} elseif (preg_match('/There are ([0-9]+) of a max of ([0-9]+) players online:/', $data, $matches)) {
 	$users = str_replace(',', '', $matches[1]);
 	$maxusers = str_replace(',', '', $matches[2]);