diff --git a/src/main/java/net/knarcraft/stargatecommand/StargateCommand.java b/src/main/java/net/knarcraft/stargatecommand/StargateCommand.java index 88bd3ce..6f6dbe1 100644 --- a/src/main/java/net/knarcraft/stargatecommand/StargateCommand.java +++ b/src/main/java/net/knarcraft/stargatecommand/StargateCommand.java @@ -57,16 +57,6 @@ public class StargateCommand extends JavaPlugin { //Currently, nothing needs to be disabled } - /** - * Gets the character used to replace spaces in portal and network names - * - * @return
The character used to replace spaces
- */ - public static char getSpaceReplacementCharacter() { - //TODO: Make this configurable - return '⚊'; - } - /** * Gets an instance of this plugin * diff --git a/src/main/java/net/knarcraft/stargatecommand/command/CommandConfig.java b/src/main/java/net/knarcraft/stargatecommand/command/CommandConfig.java index f0e4562..5f7babc 100644 --- a/src/main/java/net/knarcraft/stargatecommand/command/CommandConfig.java +++ b/src/main/java/net/knarcraft/stargatecommand/command/CommandConfig.java @@ -230,9 +230,10 @@ public class CommandConfig implements CommandExecutor { */ private void printConfigOptionValue(CommandSender sender, ConfigurationOption option) { Object value = configurationAPI.getConfigurationOptionValue(option); - sender.sendMessage(getOptionDescription(option)); - sender.sendMessage(StringFormatter.replacePlaceholder(Translator.getTranslatedMessage( - TranslatableMessage.CONFIG_OPTION_CURRENT_VALUE), "{value}", String.valueOf(value))); + String description = getOptionDescription(option); + String currentValue = StringFormatter.replacePlaceholder(Translator.getTranslatedMessage( + TranslatableMessage.CONFIG_OPTION_CURRENT_VALUE), "{value}", String.valueOf(value)); + sender.sendMessage(StringFormatter.formatInfoMessage(description + "\n" + currentValue)); } /** @@ -241,13 +242,15 @@ public class CommandConfig implements CommandExecutor { * @param senderThe command sender to display the config list to
*/ private void displayConfigValues(CommandSender sender) { - sender.sendMessage(Translator.getTranslatedMessage(TranslatableMessage.CONFIG_VALUES_HEADER)); + StringBuilder stringBuilder = new StringBuilder(); + stringBuilder.append(StringFormatter.getTranslatedInfoMessage(TranslatableMessage.CONFIG_VALUES_HEADER)); for (ConfigurationOption option : ConfigurationOption.values()) { if (!bannedConfigOptions.contains(option)) { - sender.sendMessage(getOptionDescription(option)); + stringBuilder.append("\n").append(getOptionDescription(option)); } } + sender.sendMessage(stringBuilder.toString()); } /** diff --git a/src/main/java/net/knarcraft/stargatecommand/command/TabCommandInfo.java b/src/main/java/net/knarcraft/stargatecommand/command/TabCommandInfo.java index 7ce8943..f2af6e1 100644 --- a/src/main/java/net/knarcraft/stargatecommand/command/TabCommandInfo.java +++ b/src/main/java/net/knarcraft/stargatecommand/command/TabCommandInfo.java @@ -3,6 +3,9 @@ package net.knarcraft.stargatecommand.command; import net.TheDgtl.Stargate.network.RegistryAPI; import net.TheDgtl.Stargate.network.portal.Portal; import net.TheDgtl.Stargate.network.portal.PortalFlag; +import net.knarcraft.stargatecommand.formatting.StringFormatter; +import net.knarcraft.stargatecommand.formatting.TranslatableMessage; +import net.knarcraft.stargatecommand.formatting.Translator; import net.knarcraft.stargatecommand.property.StargateCommandCommand; import net.knarcraft.stargatecommand.util.PortalFinderHelper; import org.apache.commons.lang.StringUtils; @@ -18,6 +21,8 @@ import java.util.ArrayList; import java.util.List; import java.util.Set; +import static net.knarcraft.stargatecommand.formatting.StringFormatter.getTranslatedErrorMessage; + /** * This tab-command represents the command for getting information about a seen portal */ @@ -38,36 +43,33 @@ public class TabCommandInfo implements TabExecutor { public boolean onCommand(@NotNull CommandSender commandSender, @NotNull Command command, @NotNull String s, @NotNull String[] args) { if (!(commandSender instanceof Player player)) { - commandSender.sendMessage("This command can only be used by a player"); + commandSender.sendMessage(getTranslatedErrorMessage(TranslatableMessage.COMMAND_PLAYER_ONLY)); return true; } if (!player.hasPermission(StargateCommandCommand.INFO.getPermissionNode())) { - player.sendMessage("Permission Denied"); + player.sendMessage(getTranslatedErrorMessage(TranslatableMessage.PERMISSION_DENIED)); return true; } Portal portal = PortalFinderHelper.findPortalByRaytrace(registryAPI, player, 15); if (portal == null) { - commandSender.sendMessage("You need to look directly at a portal to get information about it"); + commandSender.sendMessage(getTranslatedErrorMessage(TranslatableMessage.NO_PORTAL_IN_SIGHT)); return true; } - StringBuilder stringBuilder = new StringBuilder(); - stringBuilder.append("Information about the Stargate you are currently looking at:").append("\n"); - stringBuilder.append("|- ").append("Name: ").append(portal.getName()).append("\n"); - String destination = portal.getDestinationName(); - if (destination != null && !destination.equalsIgnoreCase("null")) { - stringBuilder.append("|- ").append("Destination: ").append(portal.getDestinationName()).append("\n"); - } - stringBuilder.append("|- ").append("Network: ").append(portal.getNetwork().getName()).append("\n"); + Player owner = Bukkit.getPlayer(portal.getOwnerUUID()); - if (owner != null) { - stringBuilder.append("|- ").append("Owner: ").append(owner.getName()).append("\n"); - } else { - stringBuilder.append("|- ").append("Owner: ").append(portal.getOwnerUUID()).append("\n"); - } + String name = portal.getName(); + String destination = portal.getDestinationName() == null ? "" : portal.getDestinationName(); + String network = portal.getNetwork().getName(); + String ownerName = owner != null ? owner.getName() : portal.getOwnerUUID().toString(); Set