diff --git a/README.md b/README.md index bf502d0..2316d3d 100644 --- a/README.md +++ b/README.md @@ -20,6 +20,7 @@ Stargate-Command is an addon for Stargate which adds additional useful commands ``` stargate.command.config - Gives access to the `/sgc config` command stargate.command.dial - Gives access to the `/sgc dial` command +stargate.command.visualizer- Gives access to the `/sgc visualizer` command ``` # Changes diff --git a/src/main/java/net/knarcraft/stargatecommand/command/CommandDial.java b/src/main/java/net/knarcraft/stargatecommand/command/CommandDial.java index 0fddd51..09220a2 100644 --- a/src/main/java/net/knarcraft/stargatecommand/command/CommandDial.java +++ b/src/main/java/net/knarcraft/stargatecommand/command/CommandDial.java @@ -37,6 +37,10 @@ public class CommandDial implements CommandExecutor { commandSender.sendMessage("This command can only be used by players"); return true; } + if (!player.hasPermission("stargate.command.dial")) { + player.sendMessage("Permission Denied"); + return true; + } if (args.length < 2) { player.sendMessage("You need to provide a network name and a portal name to dial"); diff --git a/src/main/java/net/knarcraft/stargatecommand/command/CommandStarGateCommand.java b/src/main/java/net/knarcraft/stargatecommand/command/CommandStarGateCommand.java index 6ff7066..718ff8d 100644 --- a/src/main/java/net/knarcraft/stargatecommand/command/CommandStarGateCommand.java +++ b/src/main/java/net/knarcraft/stargatecommand/command/CommandStarGateCommand.java @@ -39,6 +39,8 @@ public class CommandStarGateCommand implements CommandExecutor { commandSender, command, s, subArgs); } else if (args[0].equalsIgnoreCase("dial")) { return new CommandDial(stargateAPI).onCommand(commandSender, command, s, subArgs); + } else if (args[0].equalsIgnoreCase("visualizer")) { + return new CommandVisualizer(stargateAPI.getRegistry()).onCommand(commandSender, command, s, subArgs); } } return false; diff --git a/src/main/java/net/knarcraft/stargatecommand/command/CommandVisualizer.java b/src/main/java/net/knarcraft/stargatecommand/command/CommandVisualizer.java new file mode 100644 index 0000000..f062b29 --- /dev/null +++ b/src/main/java/net/knarcraft/stargatecommand/command/CommandVisualizer.java @@ -0,0 +1,86 @@ +package net.knarcraft.stargatecommand.command; + +import net.TheDgtl.Stargate.network.Network; +import net.TheDgtl.Stargate.network.RegistryAPI; +import net.TheDgtl.Stargate.network.portal.FixedPortal; +import net.TheDgtl.Stargate.network.portal.Portal; +import net.TheDgtl.Stargate.network.portal.PortalFlag; +import org.bukkit.command.Command; +import org.bukkit.command.CommandExecutor; +import org.bukkit.command.CommandSender; +import org.jetbrains.annotations.NotNull; + +/** + * This command represents the command for visualizing a Stargate network + */ +public class CommandVisualizer implements CommandExecutor { + + private final RegistryAPI registryAPI; + + /** + * Instantiates a visualizer command + * + * @param registryAPI
A reference to the registry API
+ */ + public CommandVisualizer(RegistryAPI registryAPI) { + this.registryAPI = registryAPI; + } + + @Override + public boolean onCommand(@NotNull CommandSender commandSender, @NotNull Command command, @NotNull String s, + @NotNull String[] args) { + if (!commandSender.hasPermission("stargate.command.visualizer")) { + commandSender.sendMessage("Permission Denied"); + return true; + } + + if (args.length < 1) { + commandSender.sendMessage("A network must be provided"); + return true; + } + + Network network = registryAPI.getNetwork(args[0], false); + if (network == null) { + commandSender.sendMessage("You must provide a valid network to visualize"); + return true; + } + + StringBuilder stringBuilder = new StringBuilder(); + + stringBuilder.append("All portals in network: ").append(network.getName()).append("\n"); + stringBuilder.append("Symbol explanation: ").append("\n"); + stringBuilder.append("# = hidden, ¤ = not hidden").append("\n"); + stringBuilder.append("O = always on, - = not always on").append("\n"); + stringBuilder.append("| = fixed, > = destination choose-able"); + + //Print info about all portals in the network + for (Portal portal : network.getAllPortals()) { + stringBuilder.append("\n"); + if (portal.hasFlag(PortalFlag.HIDDEN)) { + stringBuilder.append('#'); + } else { + stringBuilder.append('¤'); + } + if (portal.hasFlag(PortalFlag.ALWAYS_ON)) { + stringBuilder.append('O'); + } else { + stringBuilder.append('-'); + } + //TODO: Look for the fixed flag instead of FixedPortal once it's fixed + if (portal instanceof FixedPortal) { + stringBuilder.append('|'); + } else { + stringBuilder.append('>'); + } + stringBuilder.append(" ").append(portal.getName()); + if (portal instanceof FixedPortal) { + stringBuilder.append(" -> "); + stringBuilder.append(portal.getDestinationName()); + } + } + + commandSender.sendMessage(stringBuilder.toString()); + return true; + } + +} diff --git a/src/main/java/net/knarcraft/stargatecommand/command/ConfigTabCompleter.java b/src/main/java/net/knarcraft/stargatecommand/command/ConfigTabCompleter.java index 0e94ece..aab2f81 100644 --- a/src/main/java/net/knarcraft/stargatecommand/command/ConfigTabCompleter.java +++ b/src/main/java/net/knarcraft/stargatecommand/command/ConfigTabCompleter.java @@ -11,8 +11,10 @@ import org.jetbrains.annotations.Nullable; import java.util.ArrayList; import java.util.List; +import static net.knarcraft.stargatecommand.util.TabCompleterHelper.filterMatching; + /** - * This is the completer for stargates config sub-command (/sg config) + * This is the completer for stargates config sub-command (/sgc config) */ public class ConfigTabCompleter implements TabCompleter { @@ -60,23 +62,6 @@ public class ConfigTabCompleter implements TabCompleter { } } - /** - * Find completable strings which match the text typed by the command's sender - * - * @param valuesThe values to filter
- * @param typedTextThe text the player has started typing
- * @returnThe given string values which start with the player's typed text
- */ - private ListA reference to the registry API
+ */ + public VisualizerTabCompleter(RegistryAPI registryAPI) { + this.registryAPI = registryAPI; + } + + @Nullable + @Override + public ListThe values to filter
+ * @param typedTextThe text the player has started typing
+ * @returnThe given string values which start with the player's typed text
+ */ + public static List