kick member from the nation

Author: zefir-git

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

@@ -294,6 +294,12 @@ public Messages() {
                                 .replaceAll("<member-name>", Optional.ofNullable(member.player().getName()).orElse(member.uuid.toString())));
     }
 
+    public @NotNull Component nationMembersKicked(final @NotNull Member member) {
+        return MiniMessage.miniMessage()
+                .deserialize(Objects.requireNonNull(config.getString("nation.members.kicked")), Placeholder.unparsed("player", Optional
+                        .ofNullable(member.player().getName()).orElse(member.uuid.toString())));
+    }
+
     // errors
 
     public @NotNull Component errorNoPermission() {
@@ -372,10 +378,20 @@ public Messages() {
         return MiniMessage.miniMessage().deserialize(Objects.requireNonNull(config.getString("error.not-in-nation")));
     }
 
+    public @NotNull Component errorMemberNotYourNation(final @NotNull Member member) {
+        return MiniMessage.miniMessage().deserialize(Objects.requireNonNull(config.getString("error.member-not-your-nation")), 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")));
     }
 
+    public @NotNull Component errorKickLeadership() {
+        return MiniMessage.miniMessage().deserialize(Objects.requireNonNull(config.getString("error.kick-leadership")));
+    }
+
     public record SubCommandArgument(@NotNull String name, boolean required) {
         public @NotNull Component component() {
             return required ? SMPCore.messages().subCommandArgumentRequired(name) : SMPCore.messages()

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

@@ -117,6 +117,12 @@ public void add(final @NotNull Member member) {
         getTeam().addPlayer(member.player());
     }
 
+    public void remove(final @NotNull Member member) {
+        member.nationID = null;
+        member.save();
+        getTeam().removePlayer(member.player());
+    }
+
     public Nation(final @NotNull ResultSet rs) throws @NotNull SQLException {
         this(
                 rs.getString("id"),

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

@@ -2,11 +2,13 @@
 
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.TextComponent;
+import org.bukkit.OfflinePlayer;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import pro.cloudnode.smp.smpcore.Member;
+import pro.cloudnode.smp.smpcore.Messages;
 import pro.cloudnode.smp.smpcore.Nation;
 import pro.cloudnode.smp.smpcore.Permission;
 import pro.cloudnode.smp.smpcore.SMPCore;
@@ -45,7 +47,10 @@ public boolean helpSubCommands(final @NotNull Member member, final @NotNull Comm
         final @NotNull String command = "/" + label;
         final @NotNull TextComponent.Builder subCommandBuilder = Component.text()
                 .append(SMPCore.messages().subCommandHeader("Nation", command + " ...")).append(Component.newline());
-        if (member.nationID != null && sender.hasPermission(Permission.NATION_MEMBERS_LIST)) subCommandBuilder.append(Component.newline()).append(SMPCore.messages()
+        if (member.nationID != null && (
+                sender.hasPermission(Permission.NATION_MEMBERS_LIST)
+                || sender.hasPermission(Permission.NATION_MEMBERS_KICK)
+        )) subCommandBuilder.append(Component.newline()).append(SMPCore.messages()
                 .subCommandEntry(command + " members ", "members"));
         return sendMessage(sender, subCommandBuilder.build());
     }
@@ -56,6 +61,7 @@ public boolean members(final @NotNull Member member, final @NotNull CommandSende
         final @NotNull String @NotNull [] argsSubset = Arrays.copyOfRange(args, 1, args.length);
         return switch (args[0]) {
             case "list" -> listMembers(member, sender);
+            case "kick" -> kickMember(member, sender, command, argsSubset);
             default -> membersSubcommand(sender, "/" + label);
         };
     }
@@ -65,6 +71,8 @@ public boolean membersSubcommand(final @NotNull CommandSender sender, final @Not
                 .append(SMPCore.messages().subCommandHeader("Nation Members", label + " ...")).append(Component.newline());
         if (sender.hasPermission(Permission.NATION_MEMBERS_LIST)) subCommandBuilder.append(Component.newline()).append(SMPCore.messages()
                 .subCommandEntry(label + " list ", "list"));
+        if (sender.hasPermission(Permission.NATION_MEMBERS_KICK)) subCommandBuilder.append(Component.newline()).append(SMPCore.messages()
+                .subCommandEntry(label + " kick ", "kick", Messages.SubCommandArgument.of(new Messages.SubCommandArgument("member", true)), "remove a member from the nation"));
         return sendMessage(sender, subCommandBuilder.build());
     }
 
@@ -78,4 +86,25 @@ public boolean listMembers(final @NotNull Member member, final @NotNull CommandS
 
         return sendMessage(sender, SMPCore.messages().nationMembersList(nation.get(), sender));
     }
+
+    public boolean kickMember(final @NotNull Member member, final @NotNull CommandSender sender, final @NotNull String label, final @NotNull String @NotNull [] args) {
+        if (!sender.hasPermission(Permission.NATION_MEMBERS_KICK))
+            return sendMessage(sender, SMPCore.messages().errorNoPermission());
+        final @NotNull Optional<@NotNull Nation> nation = member.nation();
+        if (nation.isEmpty())
+            return sendMessage(sender, SMPCore.messages().errorNotInNation());
+        if (args.length == 0) return sendMessage(sender, SMPCore.messages().usage(label, "kick <member>"));
+        final @NotNull OfflinePlayer target = sender.getServer().getOfflinePlayer(args[0]);
+        final @NotNull Optional<@NotNull Member> targetMemberOptional = Member.get(target);
+        if (targetMemberOptional.isEmpty())
+            return sendMessage(sender, SMPCore.messages().errorNotMember(target));
+        final @NotNull Member targetMember = targetMemberOptional.get();
+        if (targetMember.nationID == null || !targetMember.nationID.equals(member.nationID))
+            return sendMessage(sender, SMPCore.messages().errorMemberNotYourNation(targetMember));
+        if (targetMember.uuid.equals(nation.get().leaderUUID) || targetMember.uuid.equals(nation.get().viceLeaderUUID))
+            return sendMessage(sender, SMPCore.messages().errorKickLeadership());
+
+        nation.get().remove(targetMember);
+        return sendMessage(sender, SMPCore.messages().nationMembersKicked(targetMember));
+    }
 }

src/main/resources/messages.yml

@@ -62,6 +62,7 @@ nation:
         kick: <click:run_command:/nation kick <member-name>><hover:show_text:'Remove member from the nation'><dark_gray>[<red>Kick</red>]</dark_gray></hover></click>
         demote: <click:run_command:/nation vice-demote <member-name>><hover:show_text:'Demote vice-leader to citizen'><dark_gray>[<red>Demote</red>]</dark_gray></hover></click>
         promote: <click:run_command:/nation vice-promote <member-name>><hover:show_text:'Appoint citizen as vice-leader'><dark_gray>[<green>Promote</green>]</dark_gray></hover></click>
+    kicked: <green>(!) Player <gray><player></gray> is no longer a member of the nation.</green>
 error:
   no-permission: <red>(!) You don't have permission to use this command.</red>
   player-not-banned: <red>(!) Player <gray><player></gray> is not banned and is not a member.</red>
@@ -77,4 +78,6 @@ error:
   never-joined: <red>(!) Player <gray><player></gray> has never played on the server.</red>
   command-on-staff: <red>(!) You cannot use <gray>/<command></gray> on staff.</red>
   not-in-nation: <red>(!) You are not a member of any nation.</red>
+  member-not-your-nation: <red>(!) Member <gray><player></gray> is not a member of your nation.</red>
   not-player: <red>(!) You must be a player to use this command.</red>
+  nation-kick-leadership: <red>(!) You cannot kick a member of the nation's leadership.</red>