command to add member to nation

Author: zefir-git

src/main/java/pro/cloudnode/smp/smpcore/Messages.java

@@ -430,6 +430,10 @@ public Messages() {
         return MiniMessage.miniMessage().deserialize(Objects.requireNonNull(config.getString("error.already-citizen-player")), Placeholder.unparsed("player", Optional.ofNullable(member.player().getName()).orElse(member.player().getUniqueId().toString())));
     }
 
+    public @NotNull Component errorOtherCitizen(final @NotNull Member member) {
+        return MiniMessage.miniMessage().deserialize(Objects.requireNonNull(config.getString("error.other-citizen")), Placeholder.unparsed("player", Optional.ofNullable(member.player().getName()).orElse(member.player().getUniqueId().toString())));
+    }
+
     public @NotNull Component errorNotPlayer() {
         return MiniMessage.miniMessage().deserialize(Objects.requireNonNull(config.getString("error.not-player")));
     }

src/main/java/pro/cloudnode/smp/smpcore/Permission.java

@@ -122,6 +122,21 @@ public final class Permission {
      */
     public static @NotNull String NATION_LEAVE = "smpcore.nation.leave";
 
+    /**
+     * Add member to your nation
+     */
+    public static @NotNull String NATION_CITIZEN_ADD = "smpcore.nation.citizens.add";
+
+    /**
+     * Add member to any nation
+     */
+    public static @NotNull String NATION_CITIZEN_ADD_OTHER = "smpcore.nation.citizens.add.other";
+
+    /**
+     * Add member to nation even if they are already in another
+     */
+    public static @NotNull String NATION_CITIZEN_ADD_SWITCH = "smpcore.nation.citizens.add.switch";
+
     /**
      * Appoint nation citizen as vice-leader
      */

src/main/java/pro/cloudnode/smp/smpcore/command/NationCommand.java

@@ -129,6 +129,7 @@ public boolean citizens(
             case "list" -> listCitizens(member, nation, sender);
             case "kick" -> kickCitizen(member, nation, sender, command, argsSubset);
             case "invite" -> inviteCitizen(member, nation, sender, command, argsSubset);
+            case "add" -> addCitizen(member, nation, sender, command, argsSubset);
             default -> citizensSubcommand(member, nation, sender, "/" + label);
         };
     }
@@ -171,6 +172,14 @@ public boolean citizensSubcommand(
                     }, "Invite to join nation."
             ));
 
+        if ((!other && sender.hasPermission(Permission.NATION_CITIZEN_ADD))
+        || sender.hasPermission(Permission.NATION_CITIZEN_ADD_OTHER))
+            subCommandBuilder.append(Component.newline()).append(SMPCore.messages().subCommandEntry(
+                    label + " add ", "add", new Messages.SubCommandArgument[]{
+                            new Messages.SubCommandArgument("member", true)
+                    }, "Add member to nation."
+            ));
+
         return sendMessage(sender, subCommandBuilder.build());
     }
 
@@ -268,6 +277,45 @@ public boolean inviteCitizen(
         return true;
     }
 
+    public boolean addCitizen(
+            final @Nullable Member member,
+            final @NotNull Nation nation,
+            final @NotNull CommandSender sender,
+            final @NotNull String label,
+            final @NotNull String @NotNull [] args
+    ) {
+        if (
+                !sender.hasPermission(Permission.NATION_CITIZEN_ADD)
+                        || (
+                        (member == null || !nation.id.equals(member.nationID))
+                                && !sender.hasPermission(Permission.NATION_CITIZEN_ADD_OTHER)
+                )
+        )
+            return sendMessage(sender, SMPCore.messages().errorNoPermission());
+
+        if (args.length < 1)
+            return sendMessage(sender, SMPCore.messages().usage(label, "<member>"));
+
+        final @NotNull var targetPlayer = sender.getServer().getOfflinePlayer(args[0]);
+        final @NotNull var target = Member.get(targetPlayer);
+
+        if (target.isEmpty())
+            return sendMessage(sender, SMPCore.messages().errorNotMember(targetPlayer));
+
+        if (nation.id.equals(target.get().nationID))
+            return sendMessage(sender, SMPCore.messages().errorAlreadyCitizen(target.get()));
+
+        if (target.get().nationID != null && !sender.hasPermission(Permission.NATION_CITIZEN_ADD_SWITCH))
+            return sendMessage(sender, SMPCore.messages().errorOtherCitizen(target.get()));
+
+        final var currentNation = target.get().nation().orElseThrow(() -> new IllegalStateException("Could not find nation " + target.get().nationID + " of member " + target.get().uuid));
+        if (currentNation.leaderUUID.equals(targetPlayer.getUniqueId()))
+            return sendMessage(sender, SMPCore.messages().errorKickLeadership());
+
+        nation.add(target.get());
+        return true;
+    }
+
     public boolean join(
             final @Nullable Member member,
             final @NotNull CommandSender sender,

src/main/resources/messages.yml

@@ -93,6 +93,7 @@ error:
   already-citizen: <red>(!) You are already a citizen of a nation.</red>
   already-citizen-nation: <red>(!) You are already a citizen of <gray><nation></gray>.</red>
   already-citizen-player: <red>(!) Citizen <gray><player></gray> is already in the nation.</red>
+  other-citizen: <red>(!) Member <gray><player></gray> is a citizen of another nation.</red>
   not-invited: <red>(!) You were not invited to join <gray><nation></gray>.</red>
   already-requested-join: <red>(!) You have already requested to join <gray><nation></gray>.</red>
   already-invited: <red>(!) You have already invited <gray><player></gray> to join the nation.</red>