From d86c763716cb4f182bd80fcfcfd7e3c778106ef5 Mon Sep 17 00:00:00 2001 From: Tastybento Date: Wed, 3 Jan 2018 07:56:10 -0800 Subject: [PATCH] Fixed island multihome to match new syntax. Renamed island multihome to start with "Custom" to make it clearer. This class is as much an example as anything of how to override the default help. Renamed my author tag to be tastybento. :-) --- .../bskyblock/api/commands/BSBCommand.java | 2 +- .../api/commands/CompositeCommand.java | 2 +- .../api/commands/DefaultHelpCommand.java | 4 +--- .../bskyblock/api/commands/User.java | 2 +- ...lp.java => CustomIslandMultiHomeHelp.java} | 21 ++++++++++--------- .../commands/island/IslandCreateCommand.java | 2 +- .../commands/island/IslandGoCommand.java | 4 ++-- .../island/IslandResetnameCommand.java | 2 +- .../commands/island/IslandSethomeCommand.java | 2 +- .../commands/island/IslandSetnameCommand.java | 2 +- .../teams/AbstractIslandTeamCommand.java | 2 +- .../database/managers/island/NewIsland.java | 4 ++-- 12 files changed, 24 insertions(+), 25 deletions(-) rename src/main/java/us/tastybento/bskyblock/commands/island/{IslandMultiHomeHelp.java => CustomIslandMultiHomeHelp.java} (68%) diff --git a/src/main/java/us/tastybento/bskyblock/api/commands/BSBCommand.java b/src/main/java/us/tastybento/bskyblock/api/commands/BSBCommand.java index 633a792b7..542a2929c 100644 --- a/src/main/java/us/tastybento/bskyblock/api/commands/BSBCommand.java +++ b/src/main/java/us/tastybento/bskyblock/api/commands/BSBCommand.java @@ -6,7 +6,7 @@ import java.util.Optional; /** * Interface for BSkyBlock Commands - * @author ben + * @author tastybento * */ public interface BSBCommand { diff --git a/src/main/java/us/tastybento/bskyblock/api/commands/CompositeCommand.java b/src/main/java/us/tastybento/bskyblock/api/commands/CompositeCommand.java index 23d00455e..cf1195633 100644 --- a/src/main/java/us/tastybento/bskyblock/api/commands/CompositeCommand.java +++ b/src/main/java/us/tastybento/bskyblock/api/commands/CompositeCommand.java @@ -24,7 +24,7 @@ import us.tastybento.bskyblock.util.Util; /** * BSB composite command - * @author ben, poslovich + * @author tastybento, poslovich * */ public abstract class CompositeCommand extends Command implements PluginIdentifiableCommand, BSBCommand { diff --git a/src/main/java/us/tastybento/bskyblock/api/commands/DefaultHelpCommand.java b/src/main/java/us/tastybento/bskyblock/api/commands/DefaultHelpCommand.java index a0840ae6c..de981d519 100644 --- a/src/main/java/us/tastybento/bskyblock/api/commands/DefaultHelpCommand.java +++ b/src/main/java/us/tastybento/bskyblock/api/commands/DefaultHelpCommand.java @@ -2,12 +2,10 @@ package us.tastybento.bskyblock.api.commands; import java.util.List; -import org.bukkit.ChatColor; - /** * Adds a default help to every command that will show the usage of the command * and the usage of any subcommands that the command has. - * @author ben + * @author tastybento * */ public class DefaultHelpCommand extends CompositeCommand { diff --git a/src/main/java/us/tastybento/bskyblock/api/commands/User.java b/src/main/java/us/tastybento/bskyblock/api/commands/User.java index ecb181091..e1e3fe567 100644 --- a/src/main/java/us/tastybento/bskyblock/api/commands/User.java +++ b/src/main/java/us/tastybento/bskyblock/api/commands/User.java @@ -21,7 +21,7 @@ import us.tastybento.bskyblock.config.Settings; /** * BSB's user object. Wraps Player. - * @author ben + * @author tastybento * */ public class User { diff --git a/src/main/java/us/tastybento/bskyblock/commands/island/IslandMultiHomeHelp.java b/src/main/java/us/tastybento/bskyblock/commands/island/CustomIslandMultiHomeHelp.java similarity index 68% rename from src/main/java/us/tastybento/bskyblock/commands/island/IslandMultiHomeHelp.java rename to src/main/java/us/tastybento/bskyblock/commands/island/CustomIslandMultiHomeHelp.java index b08267632..244755fa8 100644 --- a/src/main/java/us/tastybento/bskyblock/commands/island/IslandMultiHomeHelp.java +++ b/src/main/java/us/tastybento/bskyblock/commands/island/CustomIslandMultiHomeHelp.java @@ -2,8 +2,6 @@ package us.tastybento.bskyblock.commands.island; import java.util.List; -import org.bukkit.ChatColor; - import us.tastybento.bskyblock.api.commands.CompositeCommand; import us.tastybento.bskyblock.api.commands.User; import us.tastybento.bskyblock.config.Settings; @@ -12,12 +10,14 @@ import us.tastybento.bskyblock.util.Util; /** * This is a custom help for the /island go and /island sethome commands. It overrides the default help sub command. * The number of homes can change depending on the player's permissions and config.yml settings. - * @author ben + * This is an example of a custom help as much as anything. + * + * @author tastybento * */ -public class IslandMultiHomeHelp extends CompositeCommand { +public class CustomIslandMultiHomeHelp extends CompositeCommand { - public IslandMultiHomeHelp(CompositeCommand parent) { + public CustomIslandMultiHomeHelp(CompositeCommand parent) { super(parent, "help"); } @@ -35,17 +35,18 @@ public class IslandMultiHomeHelp extends CompositeCommand { // This will only be shown if it is for a player if (user.isPlayer()) { // Get elements - String usage = parent.getUsage().isEmpty() ? "" : user.getTranslationOrNothing("commands.help.color.usage") + user.getTranslation(parent.getUsage()); - String params = getParameters().isEmpty() ? "" : ChatColor.RESET + " " + user.getTranslationOrNothing("commands.help.color.parameters") + user.getTranslation(getParameters()); - String desc = getDescription().isEmpty() ? "" : ChatColor.RESET + user.getTranslationOrNothing("commands.help.color.description") + " " + user.getTranslation(getDescription()); + String usage = parent.getUsage().isEmpty() ? "" : user.getTranslation(parent.getUsage()); + String params = ""; + String desc = getDescription().isEmpty() ? "" : user.getTranslation(getDescription()); // Player. Check perms if (user.hasPermission(getPermission())) { int maxHomes = Util.getPermValue(user.getPlayer(), Settings.PERMPREFIX + "island.maxhomes", Settings.maxHomes); if (maxHomes > 1) { - user.sendRawMessage(usage + params + desc); + params = getParameters().isEmpty() ? "" : user.getTranslation(getParameters()); + user.sendMessage("commands.help.syntax", "[usage]", usage, "[parameters]", params, "[description]", desc); } else { // No params - user.sendRawMessage(usage + desc); + user.sendMessage("commands.help.syntax", "[usage]", usage, "[parameters]", params, "[description]", desc); } return true; } else { diff --git a/src/main/java/us/tastybento/bskyblock/commands/island/IslandCreateCommand.java b/src/main/java/us/tastybento/bskyblock/commands/island/IslandCreateCommand.java index 0cbcd1346..e6fabf21c 100644 --- a/src/main/java/us/tastybento/bskyblock/commands/island/IslandCreateCommand.java +++ b/src/main/java/us/tastybento/bskyblock/commands/island/IslandCreateCommand.java @@ -14,7 +14,7 @@ import us.tastybento.bskyblock.config.Settings; import us.tastybento.bskyblock.database.managers.island.NewIsland; /** - * @author ben + * @author tastybento * */ public class IslandCreateCommand extends CompositeCommand { diff --git a/src/main/java/us/tastybento/bskyblock/commands/island/IslandGoCommand.java b/src/main/java/us/tastybento/bskyblock/commands/island/IslandGoCommand.java index 4d2b1a468..f41697885 100644 --- a/src/main/java/us/tastybento/bskyblock/commands/island/IslandGoCommand.java +++ b/src/main/java/us/tastybento/bskyblock/commands/island/IslandGoCommand.java @@ -15,7 +15,7 @@ import us.tastybento.bskyblock.config.Settings; import us.tastybento.bskyblock.util.Util; /** - * @author ben + * @author tastybento * */ public class IslandGoCommand extends CompositeCommand { @@ -29,7 +29,7 @@ public class IslandGoCommand extends CompositeCommand { this.setPermission(Settings.PERMPREFIX + "island.home"); this.setOnlyPlayer(true); this.setDescription("commands.island.go.description"); - new IslandMultiHomeHelp(this); + new CustomIslandMultiHomeHelp(this); } /* (non-Javadoc) diff --git a/src/main/java/us/tastybento/bskyblock/commands/island/IslandResetnameCommand.java b/src/main/java/us/tastybento/bskyblock/commands/island/IslandResetnameCommand.java index 244eb1a14..3e7e5fa87 100644 --- a/src/main/java/us/tastybento/bskyblock/commands/island/IslandResetnameCommand.java +++ b/src/main/java/us/tastybento/bskyblock/commands/island/IslandResetnameCommand.java @@ -11,7 +11,7 @@ import us.tastybento.bskyblock.api.commands.User; import us.tastybento.bskyblock.config.Settings; /** - * @author ben + * @author tastybento * */ public class IslandResetnameCommand extends CompositeCommand { diff --git a/src/main/java/us/tastybento/bskyblock/commands/island/IslandSethomeCommand.java b/src/main/java/us/tastybento/bskyblock/commands/island/IslandSethomeCommand.java index a93f982d6..9d135b650 100644 --- a/src/main/java/us/tastybento/bskyblock/commands/island/IslandSethomeCommand.java +++ b/src/main/java/us/tastybento/bskyblock/commands/island/IslandSethomeCommand.java @@ -19,7 +19,7 @@ public class IslandSethomeCommand extends CompositeCommand { this.setPermission(Settings.PERMPREFIX + "island.sethome"); this.setOnlyPlayer(true); this.setDescription("commands.island.sethome.description"); - new IslandMultiHomeHelp(this); + new CustomIslandMultiHomeHelp(this); } @Override diff --git a/src/main/java/us/tastybento/bskyblock/commands/island/IslandSetnameCommand.java b/src/main/java/us/tastybento/bskyblock/commands/island/IslandSetnameCommand.java index b6ff79135..a19772821 100644 --- a/src/main/java/us/tastybento/bskyblock/commands/island/IslandSetnameCommand.java +++ b/src/main/java/us/tastybento/bskyblock/commands/island/IslandSetnameCommand.java @@ -15,7 +15,7 @@ import us.tastybento.bskyblock.api.commands.User; import us.tastybento.bskyblock.config.Settings; /** - * @author ben + * @author tastybento * */ public class IslandSetnameCommand extends CompositeCommand { diff --git a/src/main/java/us/tastybento/bskyblock/commands/island/teams/AbstractIslandTeamCommand.java b/src/main/java/us/tastybento/bskyblock/commands/island/teams/AbstractIslandTeamCommand.java index 4d9754226..d0789c5df 100644 --- a/src/main/java/us/tastybento/bskyblock/commands/island/teams/AbstractIslandTeamCommand.java +++ b/src/main/java/us/tastybento/bskyblock/commands/island/teams/AbstractIslandTeamCommand.java @@ -17,7 +17,7 @@ import us.tastybento.bskyblock.config.Settings; /** * A safe common space for team commands to share data - * @author ben + * @author tastybento * */ public abstract class AbstractIslandTeamCommand extends CompositeCommand { diff --git a/src/main/java/us/tastybento/bskyblock/database/managers/island/NewIsland.java b/src/main/java/us/tastybento/bskyblock/database/managers/island/NewIsland.java index dd6a03d5e..2d96c4fff 100644 --- a/src/main/java/us/tastybento/bskyblock/database/managers/island/NewIsland.java +++ b/src/main/java/us/tastybento/bskyblock/database/managers/island/NewIsland.java @@ -18,7 +18,7 @@ import us.tastybento.bskyblock.island.builders.IslandBuilder.IslandType; /** * Create and paste a new island - * @author ben + * @author tastybento * */ public class NewIsland { @@ -56,7 +56,7 @@ public class NewIsland { /** * Build a new island for a player using a schematic - * @author ben + * @author tastybento * */ public static class Builder {