chore: Merge ZoneListCommand and EditCommands

Author: phinner

src/main/java/com/xpdustry/domination/DominationPlugin.java

@@ -26,9 +26,6 @@
 import com.xpdustry.distributor.api.command.cloud.MindustryCommandManager;
 import com.xpdustry.distributor.api.plugin.AbstractMindustryPlugin;
 import com.xpdustry.domination.Zone.Adapter;
-import com.xpdustry.domination.commands.EditCommands;
-import com.xpdustry.domination.commands.StartCommand;
-import com.xpdustry.domination.commands.ZoneListCommand;
 import io.leangen.geantyref.TypeToken;
 import java.time.Duration;
 import java.util.ArrayList;
@@ -95,8 +92,7 @@ public void onClientCommandsRegistration(final CommandHandler handler) {
         final var annotations =
                 new AnnotationParser<>(clientCommands, CommandSender.class, params -> CommandMeta.empty());
         annotations.parse(new StartCommand(this));
-        annotations.parse(new EditCommands(this));
-        annotations.parse(new ZoneListCommand(this));
+        annotations.parse(new ZoneCommands(this));
     }
 
     public boolean isEnabled() {

src/main/java/com/xpdustry/domination/commands/StartCommand.java src/main/java/com/xpdustry/domination/StartCommand.java

@@ -16,12 +16,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package com.xpdustry.domination.commands;
+package com.xpdustry.domination;
 
 import arc.Core;
 import arc.util.Strings;
 import com.xpdustry.distributor.api.command.CommandSender;
-import com.xpdustry.domination.DominationPlugin;
 import mindustry.Vars;
 import mindustry.game.Gamemode;
 import mindustry.net.WorldReloader;

src/main/java/com/xpdustry/domination/commands/EditCommands.java src/main/java/com/xpdustry/domination/ZoneCommands.java

@@ -16,26 +16,65 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package com.xpdustry.domination.commands;
+package com.xpdustry.domination;
 
 import com.xpdustry.distributor.api.command.CommandSender;
-import com.xpdustry.domination.DominationPlugin;
-import com.xpdustry.domination.Zone;
 import mindustry.Vars;
 import org.incendo.cloud.annotation.specifier.Range;
 import org.incendo.cloud.annotations.Argument;
 import org.incendo.cloud.annotations.Command;
+import org.incendo.cloud.annotations.CommandDescription;
 import org.incendo.cloud.annotations.Flag;
 import org.incendo.cloud.annotations.Permission;
+import org.incendo.cloud.annotations.ProxiedBy;
 
-public final class EditCommands {
+public final class ZoneCommands {
 
     private final DominationPlugin domination;
 
-    public EditCommands(final DominationPlugin domination) {
+    public ZoneCommands(final DominationPlugin domination) {
         this.domination = domination;
     }
 
+    @Command("domination zone list")
+    @CommandDescription("Get the data about the zones.")
+    @ProxiedBy("zones")
+    public void listZones(final CommandSender sender) {
+        final var builder = new StringBuilder();
+        final var captured = domination.getState().getZones().stream()
+                .map(Zone::getTeam)
+                .filter(sender.getPlayer().team()::equals)
+                .count();
+        builder.append("[orange]");
+        if (captured == domination.getState().getZones().size()) {
+            builder.append("Your team is about to capture all the zones :\n");
+        } else {
+            builder.append("Your team has [red]")
+                    .append(domination.getState().getZones().size() - captured)
+                    .append("[] more zones to capture :\n");
+        }
+        final var iterator = domination.getState().getZones().iterator();
+        while (iterator.hasNext()) {
+            final var zone = iterator.next();
+            builder.append("[white]- Zone at (")
+                    .append(zone.getX() / 8)
+                    .append(", ")
+                    .append(zone.getY() / 8)
+                    .append(") is captured by ")
+                    .append("[#")
+                    .append(zone.getTeam().color)
+                    .append("]")
+                    .append(zone.getTeam().name)
+                    .append("[] at ")
+                    .append(zone.getCapture())
+                    .append("% percent.");
+            if (iterator.hasNext()) {
+                builder.append('\n');
+            }
+        }
+        sender.reply(builder.toString());
+    }
+
     @Command("domination zone radius <x> <y> <radius>")
     @Permission("com.xpdustry.domination.zone.edit")
     public void setZoneSize(