Compare commits

...
1 Commits
Author SHA1 Message Date
RoinujNosde 1c457ce552 feat: redirect commands to GUI 2022-11-29 19:51:33 -03:00
2 changed files with 40 additions and 2 deletions

No files matched your search

@@ -6,11 +6,16 @@ import net.sacredlabyrinth.phaed.simpleclans.ChatBlock;
import net.sacredlabyrinth.phaed.simpleclans.Clan;
import net.sacredlabyrinth.phaed.simpleclans.SimpleClans;
import net.sacredlabyrinth.phaed.simpleclans.commands.data.*;
import net.sacredlabyrinth.phaed.simpleclans.managers.SettingsManager;
import net.sacredlabyrinth.phaed.simpleclans.ui.InventoryDrawer;
import net.sacredlabyrinth.phaed.simpleclans.ui.frames.CoordsFrame;
import net.sacredlabyrinth.phaed.simpleclans.ui.frames.RosterFrame;
import net.sacredlabyrinth.phaed.simpleclans.utils.VanishUtils;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import static net.sacredlabyrinth.phaed.simpleclans.SimpleClans.lang;
import static net.sacredlabyrinth.phaed.simpleclans.managers.SettingsManager.ConfigField.*;
import static org.bukkit.ChatColor.RED;
@CommandAlias("%clan")
@@ -18,6 +23,8 @@ import static org.bukkit.ChatColor.RED;
public class DataCommands extends BaseCommand {
@Dependency
private SimpleClans plugin;
@Dependency
private SettingsManager settings;
@Subcommand("%vitals")
@CommandPermission("simpleclans.member.vitals")
@@ -49,6 +56,10 @@ public class DataCommands extends BaseCommand {
@CommandPermission("simpleclans.member.roster")
@Description("{@@command.description.roster}")
public void roster(Player player, Clan clan) {
if (settings.is(ENABLE_GUI)) {
InventoryDrawer.open(new RosterFrame(player, null, clan));
return;
}
ClanRoster r = new ClanRoster(plugin, player, clan);
r.send();
}
@@ -59,6 +70,10 @@ public class DataCommands extends BaseCommand {
@HelpSearchTags("local location")
@Description("{@@command.description.coords}")
public void coords(Player player, Clan clan) {
if (settings.is(ENABLE_GUI)) {
InventoryDrawer.open(new CoordsFrame(player, null, clan));
return;
}
if (VanishUtils.getNonVanished(player, clan).size() == 1) {
ChatBlock.sendMessage(player, RED + lang("you.are.the.only.member.online", player));
return;
@@ -20,7 +20,8 @@ import net.sacredlabyrinth.phaed.simpleclans.managers.RequestManager;
import net.sacredlabyrinth.phaed.simpleclans.managers.SettingsManager;
import net.sacredlabyrinth.phaed.simpleclans.managers.StorageManager;
import net.sacredlabyrinth.phaed.simpleclans.ui.InventoryDrawer;
import net.sacredlabyrinth.phaed.simpleclans.ui.frames.MainFrame;
import net.sacredlabyrinth.phaed.simpleclans.ui.frames.*;
import org.bukkit.Bukkit;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
@@ -28,6 +29,7 @@ import java.text.MessageFormat;
import java.util.Comparator;
import java.util.HashMap;
import java.util.List;
import java.util.UUID;
import static net.sacredlabyrinth.phaed.simpleclans.SimpleClans.lang;
import static net.sacredlabyrinth.phaed.simpleclans.conversation.CreateClanNamePrompt.NAME_KEY;
@@ -85,6 +87,10 @@ public class GeneralCommands extends BaseCommand {
@CommandPermission("simpleclans.anyone.leaderboard")
@Description("{@@command.description.leaderboard}")
public void leaderboard(CommandSender sender) {
if (settings.is(ENABLE_GUI) && sender instanceof Player) {
InventoryDrawer.open(new LeaderboardFrame((Player) sender, null));
return;
}
Leaderboard l = new Leaderboard(plugin, sender);
l.send();
}
@@ -94,7 +100,12 @@ public class GeneralCommands extends BaseCommand {
@CommandPermission("simpleclans.anyone.lookup")
@Description("{@@command.description.lookup.other}")
public void lookup(CommandSender sender, @Name("player") ClanPlayerInput player) {
Lookup l = new Lookup(plugin, sender, player.getClanPlayer().getUniqueId());
UUID uuid = player.getClanPlayer().getUniqueId();
if (settings.is(ENABLE_GUI) && sender instanceof Player) {
InventoryDrawer.open(new PlayerDetailsFrame((Player) sender, null, Bukkit.getOfflinePlayer(uuid)));
return;
}
Lookup l = new Lookup(plugin, sender, uuid);
l.send();
}
@@ -102,6 +113,10 @@ public class GeneralCommands extends BaseCommand {
@CommandPermission("simpleclans.member.lookup")
@Description("{@@command.description.lookup}")
public void lookup(Player sender) {
if (settings.is(ENABLE_GUI)) {
InventoryDrawer.open(new PlayerDetailsFrame(sender, null, sender));
return;
}
Lookup l = new Lookup(plugin, sender, sender.getUniqueId());
l.send();
}
@@ -134,6 +149,10 @@ public class GeneralCommands extends BaseCommand {
@CommandPermission("simpleclans.anyone.roster")
@Description("{@@command.description.roster.other}")
public void roster(CommandSender sender, @Conditions("verified") @Name("clan") ClanInput clan) {
if (settings.is(ENABLE_GUI) && sender instanceof Player) {
InventoryDrawer.open(new RosterFrame(((Player) sender), null, clan.getClan()));
return;
}
ClanRoster r = new ClanRoster(plugin, sender, clan.getClan());
r.send();
}
@@ -267,6 +286,10 @@ public class GeneralCommands extends BaseCommand {
@CommandCompletion("@clan_list_type @order")
public void list(CommandSender sender, @Optional @Values("@clan_list_type") String type,
@Optional @Single @Values("@order") String order) {
if (settings.is(ENABLE_GUI) && sender instanceof Player) {
InventoryDrawer.open(new ClanListFrame(null, (Player) sender));
return;
}
ClanList list = new ClanList(plugin, sender, type, order);
list.send();
}