Update commands

This commit is contained in:
Cola
2021-07-06 02:42:21 +01:00
parent 0673ff7bdd
commit 127ca8a414
8 changed files with 26 additions and 12 deletions

View File

@@ -20,7 +20,7 @@ import vg.civcraft.mc.namelayer.listeners.PlayerListener;
public class AcceptInvite extends BaseCommandMiddle {
@CommandAlias("nlacceptinvite|nlacceptgroup|acceptinvite|acceptgroup|accept|join|ctjoin|ctj|ag")
@CommandAlias("nlacceptinvite|nlacceptgroup|acceptinvite|acceptgroup|accept|join|ctjoin|ctj|ag|nlag")
@Syntax("<group>")
@Description("Accept an invitation to a group.")
@CommandCompletion("@NL_Invites")
@@ -48,7 +48,7 @@ public class AcceptInvite extends BaseCommandMiddle {
group.addMember(uuid, type);
group.removeInvite(uuid, true);
PlayerListener.removeNotification(uuid, group);
p.sendMessage(Component.text("You have successfully been added to the group as a " + type.name() +".").color(NamedTextColor.RED));
p.sendMessage(Component.text("You have successfully been added to the group as a " + type.name() +".").color(NamedTextColor.GREEN));
}
@TabComplete("NL_Invites")

View File

@@ -1,6 +1,7 @@
package vg.civcraft.mc.namelayer.command.commands;
import co.aikar.commands.annotation.CommandAlias;
import co.aikar.commands.annotation.CommandCompletion;
import co.aikar.commands.annotation.Description;
import co.aikar.commands.annotation.Syntax;
import java.util.Date;
@@ -22,6 +23,7 @@ public class DeleteGroup extends BaseCommandMiddle {
@CommandAlias("nldg|delete|deletegroup|groupdelete")
@Syntax("<group>")
@Description("Delete a group.")
@CommandCompletion("@NL_Groups")
public void execute(Player sender, String groupName) {
Player p = (Player) sender;
UUID uuid = NameAPI.getUUID(p.getName());

View File

@@ -1,6 +1,7 @@
package vg.civcraft.mc.namelayer.command.commands;
import co.aikar.commands.annotation.CommandAlias;
import co.aikar.commands.annotation.CommandCompletion;
import co.aikar.commands.annotation.CommandPermission;
import co.aikar.commands.annotation.Description;
import co.aikar.commands.annotation.Syntax;
@@ -15,6 +16,7 @@ public class DisciplineGroup extends BaseCommandMiddle {
@CommandPermission("namelayer.admin")
@Syntax("<group>")
@Description("Disable a group from working.")
@CommandCompletion("@NL_Groups")
public void execute(Player sender, String groupName) {
Player p = (Player) sender;
Group g = gm.getGroup(groupName);

View File

@@ -17,7 +17,7 @@ import vg.civcraft.mc.namelayer.permission.PermissionType;
public class JoinGroup extends BaseCommandMiddle {
@CommandAlias("nljg|join|joingroup")
@Syntax("<group> <password>")
@Syntax("<group> [password]")
@Description("Join a password protected group.")
public void execute(Player sender, String groupName, String attemptedPassword) {
Player p = (Player) sender;

View File

@@ -1,6 +1,7 @@
package vg.civcraft.mc.namelayer.command.commands;
import co.aikar.commands.annotation.CommandAlias;
import co.aikar.commands.annotation.CommandCompletion;
import co.aikar.commands.annotation.Description;
import co.aikar.commands.annotation.Syntax;
import java.util.UUID;
@@ -15,6 +16,7 @@ public class LeaveGroup extends BaseCommandMiddle {
@CommandAlias("nlleg|leave|leavegroup")
@Syntax("<group>")
@Description("Leave a group")
@CommandCompletion("@NL_Groups")
public void execute(Player sender, String groupName) {
Player p = (Player) sender;
Group g = gm.getGroup(groupName);

View File

@@ -1,6 +1,7 @@
package vg.civcraft.mc.namelayer.command.commands;
import co.aikar.commands.annotation.CommandAlias;
import co.aikar.commands.annotation.CommandCompletion;
import co.aikar.commands.annotation.Description;
import co.aikar.commands.annotation.Optional;
import co.aikar.commands.annotation.Syntax;
@@ -21,6 +22,7 @@ public class ListMembers extends BaseCommandMiddle {
@CommandAlias("nllm|listmembers|members")
@Syntax("<group> [rank (e.g: MEMBERS)]")
@Description("List the members in a group")
@CommandCompletion("@NL_Groups @NL_Ranks")
public void execute(Player sender, String groupName, @Optional String playerType, @Optional String playerName) {
Player p = (Player) sender;
UUID uuid = NameAPI.getUUID(p.getName());

View File

@@ -1,6 +1,7 @@
package vg.civcraft.mc.namelayer.command.commands;
import co.aikar.commands.annotation.CommandAlias;
import co.aikar.commands.annotation.CommandCompletion;
import co.aikar.commands.annotation.Description;
import co.aikar.commands.annotation.Optional;
import co.aikar.commands.annotation.Syntax;
@@ -19,6 +20,7 @@ public class ListPermissions extends BaseCommandMiddle {
@CommandAlias("nllp|listperms|perms|permissions")
@Syntax("<group> [rank (e.g: MEMBERS)]")
@Description("Show permissions for a PlayerType in a specific group.")
@CommandCompletion("@NL_Groups @NL_Ranks")
public void execute(Player sender, String groupName, @Optional String playerRank) {
Player p = (Player) sender;
Group g = gm.getGroup(groupName);

View File

@@ -1,30 +1,29 @@
package vg.civcraft.mc.namelayer.command.commands;
import co.aikar.commands.BukkitCommandCompletionContext;
import co.aikar.commands.annotation.CommandAlias;
import co.aikar.commands.annotation.CommandCompletion;
import co.aikar.commands.annotation.Description;
import co.aikar.commands.annotation.Syntax;
import java.util.List;
import java.util.UUID;
import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.format.NamedTextColor;
import org.bukkit.ChatColor;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import vg.civcraft.mc.civmodcore.commands.TabComplete;
import vg.civcraft.mc.namelayer.GroupManager;
import vg.civcraft.mc.namelayer.NameAPI;
import vg.civcraft.mc.namelayer.command.BaseCommandMiddle;
import vg.civcraft.mc.namelayer.command.TabCompleters.InviteTabCompleter;
import vg.civcraft.mc.namelayer.group.Group;
import vg.civcraft.mc.namelayer.listeners.PlayerListener;
public class RejectInvite extends BaseCommandMiddle {
@CommandAlias("nlrg|reject|rejectinvite")
@CommandAlias("nlrg|reject|rejectinvite|revoke")
@Syntax("<group>")
@Description("Reject an invitation to a group.")
public void execute(CommandSender sender, String targetGroup) {
if (!(sender instanceof Player)) {
sender.sendMessage(Component.text("Be gone console thot").color(NamedTextColor.RED));
return;
}
@CommandCompletion("@NL_Invites")
public void execute(Player sender, String targetGroup) {
Player player = (Player) sender;
String groupName = targetGroup;
Group group = GroupManager.getGroup(groupName);
@@ -48,4 +47,9 @@ public class RejectInvite extends BaseCommandMiddle {
PlayerListener.removeNotification(uuid, group);
player.sendMessage(ChatColor.GREEN + "You've successfully declined that group invitation.");
}
@TabComplete("NL_Invites")
public List<String> tabComplete(BukkitCommandCompletionContext context) {
return InviteTabCompleter.complete(context.getInput(), context.getPlayer());
}
}