From ec60dae480241ed55ffd2815f6517ac16fa9f69f Mon Sep 17 00:00:00 2001
From: James McNair <booksaw224@gmail.com>
Date: Sat, 9 Mar 2024 10:37:16 +0000
Subject: [PATCH] Improve /teama version

---
 .../java/com/booksaw/betterTeams/Main.java     | 13 +++++++------
 .../commands/teama/VersionTeama.java           | 18 ++++++++++++++----
 src/main/resources/messages.yml                |  2 ++
 3 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/booksaw/betterTeams/Main.java b/src/main/java/com/booksaw/betterTeams/Main.java
index f43a43bd..59d88e82 100644
--- a/src/main/java/com/booksaw/betterTeams/Main.java
+++ b/src/main/java/com/booksaw/betterTeams/Main.java
@@ -364,12 +364,13 @@ public void setupCommands() {
 
 		ParentCommand teamaCommand = new ParentCommand("teamadmin");
 
-		teamaCommand.addSubCommands(new ReloadTeama(), new ChatSpyTeama(), new TitleTeama(), new VersionTeama(),
-				new HomeTeama(), new NameTeama(), new DescriptionTeama(), new OpenTeama(), new InviteTeama(),
-				new CreateTeama(), new JoinTeama(), new LeaveTeama(), new PromoteTeama(), new DemoteTeama(),
-				new WarpTeama(), new SetwarpTeama(), new DelwarpTeama(), new PurgeTeama(), new DisbandTeama(),
-				new ColorTeama(), new EchestTeama(), new SetrankTeama(teamaCommand), new TagTeama(),
-				new TeleportTeama(teamaCommand), new AllyTeama(), new NeutralTeama());
+		teamaCommand.addSubCommands(new ReloadTeama(), new ChatSpyTeama(), new TitleTeama(),
+				new VersionTeama("version"), new VersionTeama("debug"), new HomeTeama(), new NameTeama(),
+				new DescriptionTeama(), new OpenTeama(), new InviteTeama(), new CreateTeama(), new JoinTeama(),
+				new LeaveTeama(), new PromoteTeama(), new DemoteTeama(), new WarpTeama(), new SetwarpTeama(),
+				new DelwarpTeama(), new PurgeTeama(), new DisbandTeama(), new ColorTeama(), new EchestTeama(),
+				new SetrankTeama(teamaCommand), new TagTeama(), new TeleportTeama(teamaCommand), new AllyTeama(),
+				new NeutralTeama());
 
 		if (getConfig().getBoolean("singleOwner")) {
 			teamaCommand.addSubCommand(new SetOwnerTeama());
diff --git a/src/main/java/com/booksaw/betterTeams/commands/teama/VersionTeama.java b/src/main/java/com/booksaw/betterTeams/commands/teama/VersionTeama.java
index 1275c723..d8c52b76 100644
--- a/src/main/java/com/booksaw/betterTeams/commands/teama/VersionTeama.java
+++ b/src/main/java/com/booksaw/betterTeams/commands/teama/VersionTeama.java
@@ -1,22 +1,32 @@
 package com.booksaw.betterTeams.commands.teama;
 
+import java.util.List;
+
+import org.bukkit.Bukkit;
+import org.bukkit.command.CommandSender;
+
 import com.booksaw.betterTeams.CommandResponse;
 import com.booksaw.betterTeams.Main;
 import com.booksaw.betterTeams.Team;
 import com.booksaw.betterTeams.commands.SubCommand;
 import com.booksaw.betterTeams.message.MessageManager;
 import com.booksaw.betterTeams.message.ReferencedFormatMessage;
-import org.bukkit.command.CommandSender;
-
-import java.util.List;
 
 public class VersionTeama extends SubCommand {
 
+	private final String command; 
+	
+	public VersionTeama(String command) {
+		this.command = command;
+	}
+	
 	@Override
 	public CommandResponse onCommand(CommandSender sender, String label, String[] args) {
 		MessageManager.sendMessageF(sender, "admin.versionstorage", Team.getTeamManager().getClass().getName());
 		MessageManager.sendMessageF(sender, "admin.versionversion", Main.plugin.getServer().getVersion());
 		MessageManager.sendMessageF(sender, "admin.versionlanguage", MessageManager.getLanguage());
+		MessageManager.sendMessageF(sender, "admin.versiononline", Boolean.toString(Bukkit.getOnlineMode()));
+		MessageManager.sendMessageF(sender, "admin.versionplayers", Integer.toString(Bukkit.getOnlinePlayers().size()));
 		return new CommandResponse(true,
 				new ReferencedFormatMessage("admin.version", Main.plugin.getDescription().getVersion() + ""));
 		
@@ -25,7 +35,7 @@ public CommandResponse onCommand(CommandSender sender, String label, String[] ar
 
 	@Override
 	public String getCommand() {
-		return "version";
+		return command;
 	}
 
 	@Override
diff --git a/src/main/resources/messages.yml b/src/main/resources/messages.yml
index 74395cd5..5913f768 100644
--- a/src/main/resources/messages.yml
+++ b/src/main/resources/messages.yml
@@ -220,6 +220,8 @@ admin.version: '&6Current plugin version: &b{0}'
 admin.versionstorage: '&6Storage Method: &b{0}'
 admin.versionversion: '&6Minecraft Version: &b{0}'
 admin.versionlanguage: '&6Language Selected: &b{0}'
+admin.versiononline: '&6Online mode: &b{0}'
+admin.versionplayers: '&6Player count: &b{0}'
 admin.noTeam: '&4That is not a team'
 admin.home.success: '&6You have been teleported to that teams home'
 admin.home.noHome: '&4That team does not have a home set'